Merge branch 'gateway' of https://github.com/dvincent-devolutions/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 26 Feb 2015 14:08:56 +0000 (09:08 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 26 Feb 2015 14:08:56 +0000 (09:08 -0500)

Trivial merge