From: iceman1001 <iceman@iuse.se>
Date: Tue, 10 Feb 2015 20:53:16 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/4ecde0e1ff60d5e3d217dc1e5ca12c78864804cc?hp=4ecde0e1ff60d5e3d217dc1e5ca12c78864804cc

Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
	armsrc/appmain.c
	armsrc/iclass.c
---