Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 14 Apr 2014 18:17:37 +0000 (14:17 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 14 Apr 2014 18:17:37 +0000 (14:17 -0400)
commit94f2a52196d1e574d16fcb3bcafa6965285c5622
tree8011191f3e75a7b5e60fde108dcda45472b5f828
parent3581d27f08e21403cc9519cf89ae5f8d9704772b
parent95b4c5619e0025abaaea15c86e06f69dbdd08bf6
Merge branch 'master' of github.com:FreeRDP/FreeRDP