Merge branch 'master' of git://github.com/awakecoding/FreeRDP
authorBenoit LeBlanc <benoit.leblanc@awakecoding.com>
Tue, 3 Jun 2014 14:05:30 +0000 (10:05 -0400)
committerBenoit LeBlanc <benoit.leblanc@awakecoding.com>
Tue, 3 Jun 2014 14:05:30 +0000 (10:05 -0400)
commitdd6ff1b56e4e34055f05cace3dceaf3837108c4c
tree20fa1678ab13153c38436fd51db7fa0b9471dfb2
parent3e0cda919f74d32bca4d5d127743c174d0740f56
parent659f80e172885924c9fb899155c7b76cc8974475
Merge branch 'master' of git://github.com/awakecoding/FreeRDP