From: Gabriele Gristina <gabriele.gristina@gmail.com>
Date: Thu, 20 Oct 2016 18:00:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/64c87a8c5f05741d16f8cad2ad71b70bffa5cab9

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

64c87a8c5f05741d16f8cad2ad71b70bffa5cab9