Merge branch 'master' of github.com:FreeRDP/FreeRDP into gateway
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 19 Mar 2015 13:38:16 +0000 (09:38 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 19 Mar 2015 13:38:16 +0000 (09:38 -0400)
commitca95ec10798e2bf95c66c2b804994b730e3f5a1a
treea373934ffd37b803bc46b8b49bd89cdf467f7835
parent1380895a2aea5014d5ab2c6b9c14ad13558082b7
parent9d77c92a2183159f1b16daaae9cf71cafd291678
Merge branch 'master' of github.com:FreeRDP/FreeRDP into gateway