Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 11 Feb 2015 15:05:33 +0000 (10:05 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 11 Feb 2015 15:05:33 +0000 (10:05 -0500)
commit94494511cc01ca3fc8cc71560ecfaaab5652dae4
tree3952a4f985674e82a0d3c837860a69a5c0c7f8c0
parent22ac46957aa4a4068d2634d9a7a0d4ad841bf853
parent23b7d3bbe21eafb7df290fa703f43d115cae655d
Merge branch 'master' of github.com:FreeRDP/FreeRDP