Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 25 Sep 2013 17:36:55 +0000 (13:36 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 25 Sep 2013 17:36:55 +0000 (13:36 -0400)
commit95b08261366c05bec83222909ba57f1bf6296c4b
tree98ffd6f6a2037620531626edcc2066f8c3327523
parentf6ee26f15a22ec1c521ff26b59121d876a940722
parent0d7df9ab72f1cc1c453db90fd8d193319b899bdf
Merge branch 'master' of github.com:FreeRDP/FreeRDP