From: iceman1001 <iceman@iuse.se>
Date: Fri, 24 Apr 2015 17:04:01 +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/fb2d24882e31c4a9915a87e28081c3f7d6f3bea4?hp=fb2d24882e31c4a9915a87e28081c3f7d6f3bea4

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

Conflicts:
	client/cmddata.c
	client/cmddata.h
	client/cmdhfmf.c
	client/cmdlf.c
	client/cmdlfem4x.h
	client/cmdlft55xx.c
	client/lualibs/default_toys.lua
	client/scripts/tnp3clone.lua
	client/scripts/tnp3dump.lua
	client/scripts/tnp3sim.lua
---