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

Trivial merge