Martin Haimberger 2862109337 Merge remote-tracking branch 'upstream/master' into mh-channel-fix
Conflicts:
	channels/smartcard/client/smartcard_main.c
	channels/smartcard/client/smartcard_operations.c
2015-07-30 07:29:12 -07:00
..
2015-07-30 06:49:21 -07:00
2015-07-27 19:24:41 +02:00
2015-06-05 10:52:40 +02:00
2015-04-21 14:18:07 +02:00
2015-07-15 03:17:38 -07:00
2015-06-22 19:23:57 +02:00