Merge branch 'master' of github.com:awakecoding/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 8 Mar 2016 02:21:17 +0000 (21:21 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 8 Mar 2016 02:21:17 +0000 (21:21 -0500)
commitc78a142388c8a8c936074bedafc42b6e72c1eabf
tree5523d8a7373b6f5540a41efdadfbe487c0fc1d9e
parentd61c2d4535d5b62487cc82dbc6d9d942c79ab587
parentceefc4b099b1b375b88aa4e001bf5c8195ad0742
Merge branch 'master' of github.com:awakecoding/FreeRDP