Martin Holst Swende 7d5ebac993 Merge branch 'master' into GenericTracing
Conflicts:
	armsrc/iso14443.c
	armsrc/iso14443a.c
	client/cmdhf.c
	client/cmdhf14b.c
2015-02-06 08:41:02 +01:00
..
2015-01-12 22:16:46 +01:00
2015-01-12 22:16:46 +01:00
2010-05-06 11:24:01 +00:00
2015-01-22 21:02:21 +01:00
2015-01-09 21:51:34 +01:00
2015-01-31 18:21:38 +01:00
2014-03-21 07:51:51 +00:00
2010-02-26 14:02:08 +00:00
2015-01-31 18:21:38 +01:00
2012-12-04 23:39:18 +00:00
2012-01-21 13:32:54 +00:00
2014-10-30 21:49:18 +01:00