Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 25 Nov 2013 17:31:43 +0000 (12:31 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 25 Nov 2013 17:31:43 +0000 (12:31 -0500)
commitb33f2224720de76e8509e47d73a212a46f5fbd15
treed15b60e87e0262f7cd55f0052768c2b0277d60ee
parent4987f2b0e1bd10fe68db2f897014971786a2fc27
parent75b919a915c87430db04bf3dc97fd8da054b87af
Merge branch 'master' of github.com:FreeRDP/FreeRDP