From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Thu, 28 Dec 2017 17:23:41 +0000 (+0100)
Subject: Merge branch 'master' into fix_printf
X-Git-Tag: v3.1.0~93^2
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/refs/pull/534/head

Merge branch 'master' into fix_printf
---

96be871374e6859af4c0a4b8de32d4824d4c09ec