From: iceman <iceman@iuse.se>
Date: Wed, 10 Feb 2016 12:29:23 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/iceman1001/proxmark3
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/480e2f239421563263d07f6d11f2c929d7f14d1f?hp=480e2f239421563263d07f6d11f2c929d7f14d1f

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

Conflicts:
	client/cmdhfmf.c
	client/cmdmain.c
---