Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 16 Mar 2015 12:01:54 +0000 (08:01 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 16 Mar 2015 12:01:54 +0000 (08:01 -0400)

Trivial merge