Merge branch 'xrdp-ng' of github.com:awakecoding/FreeRDP into xrdp-ng
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 10 Sep 2013 21:53:28 +0000 (17:53 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 10 Sep 2013 21:53:28 +0000 (17:53 -0400)

Trivial merge