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

author iceman <iceman@iuse.se>

Wed, 5 Oct 2016 15:57:29 +0000 (17:57 +0200)

committer iceman <iceman@iuse.se>

Wed, 5 Oct 2016 15:57:29 +0000 (17:57 +0200)
author iceman <iceman@iuse.se>
Wed, 5 Oct 2016 15:57:29 +0000 (17:57 +0200)
committer iceman <iceman@iuse.se>
Wed, 5 Oct 2016 15:57:29 +0000 (17:57 +0200)
diff --cc install.sh

index 666555f5351d55616395ca43b252480900ea1c0f,798efac89ff4562b80ba428a077c35689ce04f58..798efac89ff4562b80ba428a077c35689ce04f58

mode 100755,100644..100755
--- 1/install.sh
--- 2/install.sh
+++ b/install.sh
author	iceman <iceman@iuse.se>
	Wed, 5 Oct 2016 15:57:29 +0000 (17:57 +0200)
committer	iceman <iceman@iuse.se>
	Wed, 5 Oct 2016 15:57:29 +0000 (17:57 +0200)