Merge pull request #3 from Proxmark/master
authormarshmellow42 <marshmellow42@users.noreply.github.com>
Tue, 6 Jan 2015 16:02:11 +0000 (11:02 -0500)
committermarshmellow42 <marshmellow42@users.noreply.github.com>
Tue, 6 Jan 2015 16:02:11 +0000 (11:02 -0500)
commit389d0360e1b4960f556a696aa97a0703e1815a86
treef3f8b68def8b19975b12d67964d669fe857311f3
parent1c4b102cd55d96d6a870f7f2153199b9e721e077
parent6f101995b633112d092b4f61b9fb2345f85ba353
Merge pull request #3 from Proxmark/master

re sync with masterB
Impressum, Datenschutz