From: marshmellow42 <marshmellow42@users.noreply.github.com>
Date: Tue, 6 Jan 2015 19:28:59 +0000 (-0500)
Subject: Merge pull request #4 from Proxmark/master
X-Git-Tag: v2.0.0-rc1~57^2~3^2~2
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/9269081341aaca52d0b9ccee08b2bf039386fcb8?ds=inline;hp=-c

Merge pull request #4 from Proxmark/master

resync fork to master
---

9269081341aaca52d0b9ccee08b2bf039386fcb8