From: marshmellow42 <marshmellowrf@gmail.com>
Date: Thu, 16 Jul 2015 02:25:11 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v2.3.0~33^2~1
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/d5810937bdf7fd5aab2629c58740eecac1ac3b7c?hp=d5810937bdf7fd5aab2629c58740eecac1ac3b7c

Merge remote-tracking branch 'upstream/master'

Conflicts:
	armsrc/iso14443b.c
---