Merge branch 'master' of github.com:FreeRDP/FreeRDP into winpr
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 30 Jul 2012 16:33:05 +0000 (12:33 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 30 Jul 2012 16:33:05 +0000 (12:33 -0400)
commitaf0b7b3afebfc21734f7f4c3f64fd6212e0a8b35
tree062ab33f007ecea473c2741f06af68cc174c6de8
parent7f5d88c0da511c6f360fde32ede4c657354aa6d7
parentced06a0933650df3b4ff380649c7b409d7cee530
Merge branch 'master' of github.com:FreeRDP/FreeRDP into winpr
libfreerdp-core/nego.c