From: martin.holst@gmail.com <martin.holst@gmail.com@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Date: Mon, 16 Sep 2013 19:08:19 +0000 (+0000)
Subject: merged trunk changes into branch
X-Git-Tag: v1.0.0~80^2~4
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/b13fa4448f517b46e917c5145050f434d6df24d5?hp=-c

merged trunk changes into branch
---

b13fa4448f517b46e917c5145050f434d6df24d5