Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 9 Nov 2011 04:26:53 +0000 (23:26 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 9 Nov 2011 04:26:53 +0000 (23:26 -0500)
commita67096243b1fa888dcdf2a377980357ba388fef4
tree68a40d5cee0afb679b9947ba51903dda033b3186
parent823e3414d6dc421e78a7a7e258cea2ff303dddcc
parentdb23272e58ae1851b2a03677bc700dee763a8f9d
Merge branch 'master' of github.com:FreeRDP/FreeRDP