From: iceman1001 <iceman@iuse.se>
Date: Wed, 7 Jan 2015 21:55:26 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Tag: v2.0.0-rc1~44^2~22
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/024b97c5076d1c644fe84b250882569923b67c0c?hp=024b97c5076d1c644fe84b250882569923b67c0c

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

Conflicts:
	client/cmdhf.c
---