From: Martin Holst Swende <martin@swende.se>
Date: Tue, 13 Jan 2015 18:40:41 +0000 (+0100)
Subject: Merge pull request #40 from holiman/master
X-Git-Tag: v2.0.0-rc1~52^2
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/4e3d8d0f764823d3550970d6d686a86e8f04d8af?hp=-c

Merge pull request #40 from holiman/master

Iceman's changes
---

4e3d8d0f764823d3550970d6d686a86e8f04d8af