From: Iceman <iceman@iuse.se>
Date: Tue, 2 Aug 2016 21:22:51 +0000 (+0200)
Subject: Merge pull request #18 from alexgrin/iceman_master
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/9320c7363490afd4122fa0c713ef983378c960fb?hp=-c

Merge pull request #18 from alexgrin/iceman_master

A few fixes
---

9320c7363490afd4122fa0c713ef983378c960fb