From: iceman1001 <iceman@iuse.se>
Date: Mon, 16 Feb 2015 17:59:44 +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/d716ca2fc1062c3c7f67cb52b0799df32adf6b0d?ds=sidebyside;hp=d716ca2fc1062c3c7f67cb52b0799df32adf6b0d

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

Conflicts:
	armsrc/iclass.c
---