From: Martin Holst Swende <martin@swende.se>
Date: Fri, 22 May 2015 19:55:34 +0000 (+0200)
Subject: Merge pull request #101 from marshmellow42/master
X-Git-Tag: v2.1.0~12
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/86724c17c9914f495e2a7df729d4fe65a9746d82?ds=inline

Merge pull request #101 from marshmellow42/master

hf mfu updates + hf search + bug fixes
---

86724c17c9914f495e2a7df729d4fe65a9746d82