From: Martin Holst Swende <martin@swende.se>
Date: Thu, 15 Jan 2015 20:50:03 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/iceman1001/ForPm3
X-Git-Tag: v2.0.0-rc1~44^2~12^2
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/f164662363901292b83d452b107a4f630473144a?hp=f164662363901292b83d452b107a4f630473144a

Merge branch 'master' of https://github.com/iceman1001/ForPm3

Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
---