Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorVinche <sourin-v@bridgestone-bae.com>
Mon, 10 Nov 2014 23:25:36 +0000 (00:25 +0100)
committerVinche <sourin-v@bridgestone-bae.com>
Mon, 10 Nov 2014 23:25:36 +0000 (00:25 +0100)

Trivial merge