Merge branch 'master' of github.com:FreeRDP/FreeRDP-1.0
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 2 Jul 2011 21:10:22 +0000 (17:10 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 2 Jul 2011 21:10:22 +0000 (17:10 -0400)
commit2cc8ea32c99cf0ffa0862a262dff20da61c70dd6
tree7e38c64e39cd59a6b627f341b45048853915318c
parent37f3cff525815b16e87f62e8e6aca9798ab75e99
parent85d164c0c039f59d21ffc694ab8c8328bec06a06
Merge branch 'master' of github.com:FreeRDP/FreeRDP-1.0