Merge branch 'master' of github.com:awakecoding/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 3 Dec 2013 05:52:36 +0000 (00:52 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 3 Dec 2013 05:52:36 +0000 (00:52 -0500)
commitea9511fb0d2aced0a1fa158e3f075caf3ab59d7b
tree60cd0c82c9f67e70b28c5df75885785091501db3
parentd5f18e88ccdb8affa0237ac6cf8347bb42a43af6
parentc3723c66a8fd67872ea20e605daf15924e458e7c
Merge branch 'master' of github.com:awakecoding/FreeRDP