From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Thu, 2 Nov 2017 20:37:42 +0000 (+0100)
Subject: Merge branch 'master' into fix_hfmfsim
X-Git-Tag: v3.1.0~132^2
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/refs/pull/462/head

Merge branch 'master' into fix_hfmfsim
---

82f495524552e720c2661474ffcc1fcc37b6ff4d