Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 16 Sep 2013 21:11:21 +0000 (17:11 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 16 Sep 2013 21:11:21 +0000 (17:11 -0400)
commit990be143bbb1fb3583be1c496dda2ebf4e1a0c84
tree1ea515ef5b4a3d01ca425a6e6a1171cdda7fee38
parent518995a05e72ee9857ba5ad4a9ad397ea44bc5aa
parenta44fb64cf48c86acca2447fece68e41f7cef5729
Merge branch 'master' of github.com:FreeRDP/FreeRDP