From: Martin Holst Swende <martin@swende.se>
Date: Tue, 27 Jan 2015 09:21:22 +0000 (+0100)
Subject: Merge pull request #48 from marshmellow42/master
X-Git-Tag: v2.0.0-rc1~43
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/f50d457fa853bc7228635913584201efec5924aa

Merge pull request #48 from marshmellow42/master

lf demod additions & bugfixes from marshmellow
---

f50d457fa853bc7228635913584201efec5924aa