From: iceman <iceman@iuse.se>
Date: Wed, 5 Oct 2016 15:57:29 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/iceman1001/proxmark3
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/fb6e631fbb573765120d330eb7e83f44bdbde508

Merge branch 'master' of https://github.com/iceman1001/proxmark3
---

fb6e631fbb573765120d330eb7e83f44bdbde508
diff --cc install.sh
index 666555f5,798efac8..798efac8
mode 100755,100644..100755
--- a/install.sh
+++ b/install.sh