Marc-André Moreau b56eaccdc3 Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
	client/common/client.c
2014-07-28 16:58:32 -04:00
..
2014-07-28 21:55:57 +02:00
2014-07-10 11:10:58 +02:00