Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 17 Oct 2013 21:40:02 +0000 (17:40 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 17 Oct 2013 21:40:02 +0000 (17:40 -0400)
commit09c3bde7ff21138ae3d7c3f8309d7614507911e2
tree59dccd9ca29fa31c971d47ac37c84840ffa6e6f4
parent7dbe40bba811ff80222f9baef1bb8e2e6e34f68c
parente979dcf485db5684b5859b17b8a496426870c547
Merge branch 'master' of github.com:FreeRDP/FreeRDP