Merge branch 'master' of github.com:mrthebunny/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 23 Nov 2013 21:31:23 +0000 (16:31 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 23 Nov 2013 21:31:23 +0000 (16:31 -0500)

Trivial merge