Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 4 Feb 2012 23:18:54 +0000 (18:18 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 4 Feb 2012 23:18:54 +0000 (18:18 -0500)
commitb6ec892f27466e229d86dc5d6a53f659d1d34dcc
treef489fff402be1596cca5118971993dc972fc3df6
parent66cd849229c2175c32e05808b1d8108c7612ddce
parent47de99062dfe31266dbe61fd2042c211aca683cd
Merge branch 'master' of github.com:FreeRDP/FreeRDP