Merge branch 'master' of github.com:awakecoding/FreeRDP into ncrush
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 17 Mar 2014 14:18:56 +0000 (10:18 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 17 Mar 2014 14:18:56 +0000 (10:18 -0400)

Trivial merge