Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 16 Sep 2013 21:11:21 +0000 (17:11 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 16 Sep 2013 21:11:21 +0000 (17:11 -0400)

Trivial merge