Merge branch 'winpr' of github.com:FreeRDP/FreeRDP into winpr
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 30 Jul 2012 16:33:12 +0000 (12:33 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 30 Jul 2012 16:33:12 +0000 (12:33 -0400)
commitd2c39ab7329639882574cc590e1768fd73fbadfa
treeb03588e0f853fd0e27ba726b8567a8bb3f0a10b2
parentaf0b7b3afebfc21734f7f4c3f64fd6212e0a8b35
parent52c697a7e297b9eb4d6167e66d1251b4670c4c01
Merge branch 'winpr' of github.com:FreeRDP/FreeRDP into winpr