Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 20 Nov 2014 21:14:44 +0000 (16:14 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 20 Nov 2014 21:14:44 +0000 (16:14 -0500)
commitf5817ce457abc216659ddfa7c67212d35866c3b2
treef2214933a18d03a8d06bcb0f9fbe02f27fa37405
parentb8f694d8df16add7a8edd8039aa516244f1bfdce
parentd8c9a4029d3847ed7db1fa33bb665046c2390347
Merge branch 'master' of github.com:FreeRDP/FreeRDP