From: Martin Holst Swende <martin@swende.se>
Date: Tue, 28 Apr 2015 21:08:28 +0000 (+0200)
Subject: Merge pull request #98 from marshmellow42/master
X-Git-Tag: v2.1.0~15
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/2b90e3e670393990a243e1791dccd84acb9526eb?ds=sidebyside

Merge pull request #98 from marshmellow42/master

Iceman's fixes for #93, #96, #97
---

2b90e3e670393990a243e1791dccd84acb9526eb