From: iceman1001 <iceman@iuse.se>
Date: Thu, 19 Feb 2015 10:32:11 +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/f4a57e861d88657e58ef01cb96ce732d588ca91f?hp=f4a57e861d88657e58ef01cb96ce732d588ca91f

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

Conflicts:
	armsrc/iclass.c
	client/loclass/cipher.c
	client/loclass/fileutils.h
---