From: Iceman <iceman@iuse.se>
Date: Wed, 21 Jun 2017 23:13:07 +0000 (+0200)
Subject: Merge pull request #329 from marshmellow42/master
X-Git-Tag: v3.1.0~206
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/c0a2ae50daa4857cbcfc4e702105d6bd5ce04883?hp=-c

Merge pull request #329 from marshmellow42/master

iclass - updates
---

c0a2ae50daa4857cbcfc4e702105d6bd5ce04883