From: Martin Holst Swende <martin@swende.se>
Date: Mon, 20 Jul 2015 22:27:09 +0000 (+0200)
Subject: Merge pull request #133 from marshmellow42/master
X-Git-Tag: v2.3.0~33
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/85f011a55047c1249958f61cce69471536429c78

Merge pull request #133 from marshmellow42/master

14b additions + some bug fixes
---

85f011a55047c1249958f61cce69471536429c78