Marc-André Moreau 29d14773c8 Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
	client/Windows/wf_client.c
	libfreerdp/common/assistance.c
2015-05-20 10:12:24 -04:00
..
2014-10-29 16:11:22 -07:00
2014-08-12 16:57:58 -04:00
2014-11-17 00:34:17 +01:00
2014-09-15 08:55:00 +02:00
2015-04-21 14:20:24 +02:00
2014-09-29 16:08:08 -04:00
2014-11-17 00:42:05 +01:00
2014-09-29 16:08:08 -04:00