pwpiwi db2b81ba11 Merge branch 'master' into topaz
Conflicts:
	client/Makefile
	client/cmdhf.c
	client/cmdhf14a.c
2015-07-01 08:17:00 +02:00
..
2015-01-07 20:40:22 +01:00
2015-05-13 21:14:35 -04:00
2015-05-13 21:14:35 -04:00
2015-03-13 14:00:11 -04:00
2010-02-26 14:02:27 +00:00
2014-04-15 11:47:01 +01:00
2010-05-06 11:24:01 +00:00
2015-07-01 08:17:00 +02:00
2015-01-20 21:23:04 +01:00