Merge branch 'master' of github.com:awakecoding/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 13 Feb 2014 16:59:13 +0000 (11:59 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 13 Feb 2014 16:59:13 +0000 (11:59 -0500)
commitbc579912f6f0824230bf043612ec1c28f406d7ad
treed35813252a62e00bbc770042e3093df8ca76286f
parent35a1aeac99ed962c5844c30ec7a4006ca8e2189e
parentf4140abd2c5b8c53d50b0237f8e579234b3d200d
Merge branch 'master' of github.com:awakecoding/FreeRDP