From: marshmellow42 <marshmellowrf@gmail.com>
Date: Mon, 29 Jun 2015 04:06:59 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/master' into pm3+reveng
X-Git-Tag: v3.0.0~76^2~1
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/bf7ebb7b208a3b95f28a9a40f2e560a56e121794?hp=bf7ebb7b208a3b95f28a9a40f2e560a56e121794

Merge remote-tracking branch 'upstream/master' into pm3+reveng

Conflicts:
	client/Makefile
---