Merge branch 'master' of github.com:FreeRDP/FreeRDP into egfx
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 1 Jul 2014 13:01:52 +0000 (09:01 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 1 Jul 2014 13:01:52 +0000 (09:01 -0400)

Trivial merge