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

author iceman1001 <iceman@iuse.se>

Fri, 13 Feb 2015 09:16:39 +0000 (10:16 +0100)

committer iceman1001 <iceman@iuse.se>

Fri, 13 Feb 2015 09:16:39 +0000 (10:16 +0100)
author iceman1001 <iceman@iuse.se>
Fri, 13 Feb 2015 09:16:39 +0000 (10:16 +0100)
committer iceman1001 <iceman@iuse.se>
Fri, 13 Feb 2015 09:16:39 +0000 (10:16 +0100)
diff --cc client/cmddata.c
Simple merge
diff --cc client/cmddata.h
Simple merge
author	iceman1001 <iceman@iuse.se>
	Fri, 13 Feb 2015 09:16:39 +0000 (10:16 +0100)
committer	iceman1001 <iceman@iuse.se>
	Fri, 13 Feb 2015 09:16:39 +0000 (10:16 +0100)
		1	2
client/cmddata.c	patch \|	diff1 \|	diff2 \|	blob \| history
client/cmddata.h	patch \|	diff1 \|	diff2 \|	blob \| history