From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Tue, 3 Nov 2015 20:06:59 +0000 (+0100)
Subject: Merge branch 'topaz'
X-Git-Tag: v2.3.0~20
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/b2fe0e77c5d46dd5bed439c55446c32b3cc13a17?hp=b2fe0e77c5d46dd5bed439c55446c32b3cc13a17

Merge branch 'topaz'

Conflicts:
	CHANGELOG.md
	client/cmdhf.c
---