Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 10 Feb 2015 15:43:59 +0000 (10:43 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 10 Feb 2015 15:43:59 +0000 (10:43 -0500)
commitb918e18a40b7747fc0ceb36ae72bc1640ad553ce
tree41928f127fdeab4d55a04796f4c5f9fe458af574
parenta214719a95e6f61bb66af0dec882c73bc7fc1100
parentfc0a2e529d7705c6061f7bdfc4d5253e646cd6a7
Merge branch 'master' of github.com:FreeRDP/FreeRDP