Merge branch 'master' of git://github.com/awakecoding/FreeRDP
authorBenoît LeBlanc <benoit.leblanc@awakecoding.com>
Fri, 8 Nov 2013 14:44:57 +0000 (09:44 -0500)
committerBenoît LeBlanc <benoit.leblanc@awakecoding.com>
Fri, 8 Nov 2013 14:44:57 +0000 (09:44 -0500)
commitf6eb8af7310542787d97ec2cd4c144fbe593d2ba
treefa065464ed6f8eb9d5851e20c22a22b749171473
parent04cf7d301e2650b5f0ac3db9bac96418e1b37c8e
parent639f6cee696c0bc9e3b146eb10ef69979483291a
Merge branch 'master' of git://github.com/awakecoding/FreeRDP