Merge branch 'gateway' of https://github.com/dvincent-devolutions/FreeRDP into gateway
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 19 Mar 2015 13:41:50 +0000 (09:41 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 19 Mar 2015 13:41:50 +0000 (09:41 -0400)

Trivial merge