From: Frederik Möllers <frederikmoellers@posteo.de>
Date: Mon, 13 Jul 2015 09:29:33 +0000 (+0200)
Subject: Merge upstream/master
X-Git-Tag: v2.3.0~38^2~1
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/a704cbe89dddc7504705a6e8fe5ab47afb92fa88

Merge upstream/master

A new release has been pushed in the meantime and the changelog reflects
this. Things to be added to the changelog should thus go into the new
unreleased block.
---

a704cbe89dddc7504705a6e8fe5ab47afb92fa88