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
..
2015-05-11 09:07:39 +02:00
2015-04-08 11:34:37 +02:00
2015-05-11 09:07:39 +02:00
2015-04-08 11:34:37 +02:00
2015-05-11 09:07:39 +02:00
2015-05-11 09:07:39 +02:00
2015-04-08 11:34:37 +02:00
2015-05-11 09:07:39 +02:00
2015-04-08 11:34:37 +02:00
2015-05-11 09:07:39 +02:00
2015-04-08 11:34:37 +02:00
2015-01-20 11:05:32 +01:00
2015-05-11 09:07:39 +02:00
2015-05-11 09:07:39 +02:00
2015-04-08 11:34:37 +02:00