From: Martin Holst Swende <martin@swende.se>
Date: Mon, 20 Jul 2015 21:22:53 +0000 (+0200)
Subject: Merge pull request #131 from holiman/master
X-Git-Tag: v2.3.0~36
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/1adb2023ce4635bb2a67e1eb141cd2d1805dc11e

Merge pull request #131 from holiman/master

Fixes to PR #129
---

1adb2023ce4635bb2a67e1eb141cd2d1805dc11e