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

author pwpiwi <pwpiwi@users.noreply.github.com>

Tue, 16 Dec 2014 06:47:02 +0000 (07:47 +0100)

committer pwpiwi <pwpiwi@users.noreply.github.com>

Tue, 16 Dec 2014 06:47:02 +0000 (07:47 +0100)
author pwpiwi <pwpiwi@users.noreply.github.com>
Tue, 16 Dec 2014 06:47:02 +0000 (07:47 +0100)
committer pwpiwi <pwpiwi@users.noreply.github.com>
Tue, 16 Dec 2014 06:47:02 +0000 (07:47 +0100)
diff --cc armsrc/appmain.c
Simple merge
diff --cc armsrc/iclass.c
Simple merge
author	pwpiwi <pwpiwi@users.noreply.github.com>
	Tue, 16 Dec 2014 06:47:02 +0000 (07:47 +0100)
committer	pwpiwi <pwpiwi@users.noreply.github.com>
	Tue, 16 Dec 2014 06:47:02 +0000 (07:47 +0100)
		1	2
armsrc/appmain.c	patch \|	diff1 \|	diff2 \|	blob \| history
armsrc/iclass.c	patch \|	diff1 \|	diff2 \|	blob \| history