From: marshmellow42 <marshmellowrf@gmail.com>
Date: Sun, 18 Jan 2015 23:19:26 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v2.0.0-rc1~43^2~5
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/53d85a8fa1c1b98cb79c40712d1668731bdcaf49

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

53d85a8fa1c1b98cb79c40712d1668731bdcaf49