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

author iceman1001 <iceman@iuse.se>

Wed, 7 Jan 2015 10:09:05 +0000 (11:09 +0100)

committer iceman1001 <iceman@iuse.se>

Wed, 7 Jan 2015 10:09:05 +0000 (11:09 +0100)
author iceman1001 <iceman@iuse.se>
Wed, 7 Jan 2015 10:09:05 +0000 (11:09 +0100)
committer iceman1001 <iceman@iuse.se>
Wed, 7 Jan 2015 10:09:05 +0000 (11:09 +0100)
diff --cc armsrc/iclass.c
Simple merge
diff --cc client/cmdhficlass.c
Simple merge
diff --cc client/loclass/fileutils.c
Simple merge
author	iceman1001 <iceman@iuse.se>
	Wed, 7 Jan 2015 10:09:05 +0000 (11:09 +0100)
committer	iceman1001 <iceman@iuse.se>
	Wed, 7 Jan 2015 10:09:05 +0000 (11:09 +0100)
		1	2
armsrc/iclass.c	patch \|	diff1 \|	diff2 \|	blob \| history
client/cmdhficlass.c	patch \|	diff1 \|	diff2 \|	blob \| history
client/loclass/fileutils.c	patch \|	diff1 \|	diff2 \|	blob \| history