From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Wed, 1 Mar 2017 06:08:50 +0000 (+0100)
Subject: Merge pull request #220 from marshmellow42/master
X-Git-Tag: v3.0.0~62
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/f76d6fae10cc472dd874f71da353272069a53d01?hp=-c

Merge pull request #220 from marshmellow42/master

small patches and small added features listed below:
---

f76d6fae10cc472dd874f71da353272069a53d01