From: Iceman <iceman@iuse.se>
Date: Wed, 29 Mar 2017 15:12:55 +0000 (+0200)
Subject: Merge pull request #259 from marshmellow42/master
X-Git-Tag: v3.0.0~25
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/06da1c3f4b29a30dd9c9b344b4b289f716d72f6e

Merge pull request #259 from marshmellow42/master

fix/update removeParity & fix securakey detection
---

06da1c3f4b29a30dd9c9b344b4b289f716d72f6e