Merge branch 'master' of github.com:awakecoding/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 11 May 2016 17:13:02 +0000 (13:13 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 11 May 2016 17:13:02 +0000 (13:13 -0400)
commit6b73757085204b7c24295d7dee7404994b71e3de
treed12da4ba535f9d856d45203a91add795fa2d03ca
parentd4c809c4aeef3bb878a3688742ce8474d420cd80
parent915b9a15b14d4241e8b98501308eb3924fe262f0
Merge branch 'master' of github.com:awakecoding/FreeRDP