From: marshmellow42 <marshmellow42@users.noreply.github.com>
Date: Fri, 16 Jun 2017 18:46:50 +0000 (-0400)
Subject: Merge pull request #321 from Proxmark/iceman1001-patch-1
X-Git-Tag: v3.1.0~209
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/0c29544f640b8e8c03005b10229526a2d57e5954?hp=84ca27b33a1e667fb21d789f3c2c3a12d68b256e

Merge pull request #321 from Proxmark/iceman1001-patch-1

BUG: 'hf mf mifare'
---