From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 May 2015 11:13:06 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/c068ebb78f2e4070fcf1a604df0d7088374b60c6?ds=inline;hp=c068ebb78f2e4070fcf1a604df0d7088374b60c6

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

Conflicts:
	armsrc/mifarecmd.c
	client/cmdhfmf.c
---