libfreerdp: merging with master
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 19 Sep 2012 19:55:41 +0000 (15:55 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 19 Sep 2012 19:55:41 +0000 (15:55 -0400)
commitd85d25cbef3ae8611fa5f7f44cc7c99fcf8f7da5
tree8b3de3ea5b6821172dd9f855214f1d7cd3c2ef93
parent88d7d891e28fb8198b4b3ea711ca119b84ba190b
parenta8a94a3cdb10b89112b703c4b57bc3e2aa8f69a4
libfreerdp: merging with master