Merge branch 'master' of github.com:awakecoding/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 25 Feb 2013 03:33:27 +0000 (22:33 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 25 Feb 2013 03:33:27 +0000 (22:33 -0500)

Trivial merge