Merge branch 'master' of github.com:awakecoding/FreeRDP into lync
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 30 Jun 2014 21:22:50 +0000 (17:22 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 30 Jun 2014 21:22:50 +0000 (17:22 -0400)
commitf943d7fc1bb3e34aa7843d70e7b9821b2013ab62
treeeef07e393c7cd0063f06ea3042b6b2193096f05b
parente42465372a2084aade53ba2147be7b1ad74db38e
parent856880b1a56bbc4ca0425ea47da7cca7605d39e0
Merge branch 'master' of github.com:awakecoding/FreeRDP into lync