From: iceman1001 <iceman@iuse.se>
Date: Fri, 30 Jan 2015 14:22:01 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/908536d1616e4953db6fe43de8a6b0cac1972b9a

Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
	client/cmddata.c
---

908536d1616e4953db6fe43de8a6b0cac1972b9a