Merge branch 'master' of github.com:awakecoding/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 14 Oct 2014 19:24:36 +0000 (15:24 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 14 Oct 2014 19:24:36 +0000 (15:24 -0400)
commit8268c805b5b7d5e7743c2558ecc47f8c02cad078
treeeb6afcda1e17c1918f3d9357bc526c836fce8529
parentf837ba3caa5c1fb29a267796fbca555556cf2071
parent02987bbd4abd98b2935143a981ed29c5d91d6106
Merge branch 'master' of github.com:awakecoding/FreeRDP