From: holiman <martin@swende.se>
Date: Tue, 25 Mar 2014 20:49:05 +0000 (+0100)
Subject: Merge pull request #8 from pwpiwi/master
X-Git-Tag: v1.0.0~6
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/f5a1a9ce477df5dee44b230d7e6dfd0377eb167f

Merge pull request #8 from pwpiwi/master

add .gitignore and merge svn r852
---

f5a1a9ce477df5dee44b230d7e6dfd0377eb167f