From: Gabriele Gristina <gabriele.gristina@gmail.com>
Date: Sat, 29 Oct 2016 13:19:55 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/e7f43e92e9b8a8afe7aa235a34a70af59e8e6cea

Merge remote-tracking branch 'upstream/master'
---

e7f43e92e9b8a8afe7aa235a34a70af59e8e6cea