From: Martin Holst Swende <martin@swende.se>
Date: Mon, 26 Jan 2015 19:59:36 +0000 (+0100)
Subject: Merge pull request #46 from holiman/master
X-Git-Tag: v2.0.0-rc1~44
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/2595390c6d97d373253f6397a167875f37a90454?hp=dca558bf9e9b3709db27ad255167275972b06ae7

Merge pull request #46 from holiman/master

Iceman's changes, part 2
---