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

Trivial merge