From: iceman1001 <iceman@iuse.se>
Date: Tue, 10 Mar 2015 08:18:35 +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/12d708fec157dfde6f94d61e5fdc265713a71578?hp=12d708fec157dfde6f94d61e5fdc265713a71578

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

Conflicts:
	client/cmddata.c
	client/cmddata.h
---