From: marshmellow42 <marshmellowrf@gmail.com>
Date: Tue, 13 Jan 2015 21:02:23 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v2.0.0-rc1~47^2^2~2
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/ae6ead3dc84acd074be24c0da5efd94ea7a0b225

Merge remote-tracking branch 'upstream/master'

Conflicts:
	client/cmdlf.c
---

ae6ead3dc84acd074be24c0da5efd94ea7a0b225