Merge branch 'master' of github.com:FreeRDP/FreeRDP into gateway
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 29 Jan 2015 19:51:40 +0000 (14:51 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 29 Jan 2015 19:51:40 +0000 (14:51 -0500)
commitc6b6bd0a57ce2392e3d52bc92cb8bb477adb6452
treee0f84583bcb0b2b710e0cac8c110ce54066389c2
parentef71181897c8d87c302f51f4cef2ed6f923bc8d2
parent86ab147399adc823225c7e9fbc9a3e4b8df1b5ef
Merge branch 'master' of github.com:FreeRDP/FreeRDP into gateway