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

Merge pull request #3 from Proxmark/master

re sync with masterB
---

389d0360e1b4960f556a696aa97a0703e1815a86