From: Martin Holst Swende <martin@swende.se>
Date: Fri, 6 Feb 2015 07:41:02 +0000 (+0100)
Subject: Merge branch 'master' into GenericTracing
X-Git-Tag: v2.0.0-rc1~23^2~5
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/7d5ebac99397fe7661760259377a4f222fdb92cb?hp=7d5ebac99397fe7661760259377a4f222fdb92cb

Merge branch 'master' into GenericTracing

Conflicts:
	armsrc/iso14443.c
	armsrc/iso14443a.c
	client/cmdhf.c
	client/cmdhf14b.c
---