From: merlokk <olegmsn@gmail.com>
Date: Fri, 5 Jan 2018 09:57:11 +0000 (+0200)
Subject: Merge branch 'master' of github.com:Proxmark/proxmark3 into travis
X-Git-Tag: v3.1.0~86^2~2
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/314a9b9cdd3d0e45bef3158e0a40de8568edf236?ds=inline;hp=-c

Merge branch 'master' of github.com:Proxmark/proxmark3 into travis
---

314a9b9cdd3d0e45bef3158e0a40de8568edf236