From: iceman1001 <iceman@iuse.se>
Date: Thu, 18 Jun 2015 07:51:30 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/b69adb794594cc7ea43d3aa70aab091265195abf

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

Conflicts:
	armsrc/iso14443a.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	client/Makefile
	client/cmddata.c
	client/cmdhfmf.c
	client/cmdhfmfu.c
	client/lualibs/utils.lua
	client/scripting.c
	client/scripts/didump.lua
	client/util.c
	client/util.h
	common/crc16.c
	common/lfdemod.c
	common/sha1.c
---

b69adb794594cc7ea43d3aa70aab091265195abf