From: Martin Holst Swende <martin@swende.se>
Date: Mon, 16 Mar 2015 13:03:48 +0000 (+0100)
Subject: Merge pull request #80 from marshmellow42/master
X-Git-Tag: show~1
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/29a795417777b7c4f4313b6915c5aa4726ce3429?hp=-c

Merge pull request #80 from marshmellow42/master

FIX EM Error
---

29a795417777b7c4f4313b6915c5aa4726ce3429