From: marshmellow42 <marshmellow42@users.noreply.github.com>
Date: Tue, 26 Sep 2017 11:38:24 +0000 (-0400)
Subject: Merge pull request #400 from merlokk/master
X-Git-Tag: v3.1.0~168
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/1ece662f0f0f3effe8a85098f2312a7fe4869b06?hp=2ce43a28f7f7fb1c6f3c091f31d5cc4f68f36082

Merge pull request #400 from merlokk/master

fixed #395
---