From: marshmellow42 <marshmellowrf@gmail.com>
Date: Tue, 6 Jan 2015 15:58:35 +0000 (-0500)
Subject: sync with master lf files to resolve conflicts
X-Git-Tag: v2.0.0-rc1~57^2~6
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/c07b79fcbf72f530cbff5bc1e49c12bff311f50f?hp=c07b79fcbf72f530cbff5bc1e49c12bff311f50f

sync with master lf files to resolve conflicts
---