Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 22 Jun 2015 14:24:25 +0000 (10:24 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 22 Jun 2015 14:24:25 +0000 (10:24 -0400)
commit85a2caaace6635c6c3f9ef517471bb807712a050
tree27100d2366747870a26e762c5e18787c943f2e03
parent36b7d9c4e599835f50af180bcbcce8a757e30c98
parent9fab504862e5b0317f7298c4a7db21806cd4c114
Merge branch 'master' of github.com:FreeRDP/FreeRDP