From: iceman1001 <iceman@iuse.se>
Date: Thu, 11 Sep 2014 21:29:14 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/76c7e6c36368c3fc23dc4fab1fe5852023c78fac?hp=76c7e6c36368c3fc23dc4fab1fe5852023c78fac

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

Conflicts:
	client/cmdhfmf.c
---