Merge branch 'xrdp-ng' of github.com:awakecoding/FreeRDP into xrdp-ng
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 10 Sep 2013 21:53:28 +0000 (17:53 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 10 Sep 2013 21:53:28 +0000 (17:53 -0400)
commit22855c933b20d6fc815120c541cf555524a80b31
tree6021ebec35dc0ac4d67d3bbf26591827df188eb7
parent7574e7bfc98d568aaf2f43f2e82a5b2e832e6728
parentc8fe40098bb62ec48f5ad4c502b58450f9002d24
Merge branch 'xrdp-ng' of github.com:awakecoding/FreeRDP into xrdp-ng