Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 29 Feb 2012 07:26:36 +0000 (02:26 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 29 Feb 2012 07:26:36 +0000 (02:26 -0500)
commitd161d26d7c54d1f2e660c050313de10012cd3189
tree118d2b770acb1fcc70e05e87ca54a1f2dfaf08f0
parent9b04d603f7f778d498797243bf27c8f92e2f57a3
parent4ba48f409876445242a39f71dfa6412cf63edfd1
Merge branch 'master' of github.com:FreeRDP/FreeRDP