From: iceman1001 <iceman@iuse.se>
Date: Sat, 14 Feb 2015 11:30:08 +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/6af88242eb458bad91c77b424b03bf19ecce5da1

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

Conflicts:
	client/util.c
---

6af88242eb458bad91c77b424b03bf19ecce5da1