From: iceman1001 <iceman@iuse.se>
Date: Sat, 23 May 2015 06:38:46 +0000 (+0200)
Subject: Adjustments after the big merge from PM3 master.
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/ce432659f2b238ecaced79ae6fa520750690146c?hp=ce432659f2b238ecaced79ae6fa520750690146c

Adjustments after the big merge from PM3 master.
---