From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Wed, 1 Jul 2015 06:17:00 +0000 (+0200)
Subject: Merge branch 'master' into topaz
X-Git-Tag: v2.3.0~20^2~3
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/db2b81ba11bdb125a7ee22b226729f4c70acb1ad?hp=db2b81ba11bdb125a7ee22b226729f4c70acb1ad

Merge branch 'master' into topaz

Conflicts:
	client/Makefile
	client/cmdhf.c
	client/cmdhf14a.c
---