From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Sun, 5 Apr 2015 17:32:12 +0000 (+0200)
Subject: Merge branch 'master' into topaz
X-Git-Tag: v2.3.0~20^2~5
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/6306ff4bacd74eff46d44f4b62240277ecb4c670?hp=6306ff4bacd74eff46d44f4b62240277ecb4c670

Merge branch 'master' into topaz

Conflicts:
	armsrc/Makefile
	client/Makefile
---