From: iceman1001 <iceman@iuse.se>
Date: Thu, 8 Jan 2015 21:23:45 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Tag: v2.0.0-rc1~44^2~15
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/952a8bb59b197973e35ae187fc8acd2027ee570d?hp=952a8bb59b197973e35ae187fc8acd2027ee570d

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

Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	client/graph.c
---