From: Marc-André Moreau Date: Thu, 21 Jun 2012 18:30:35 +0000 (-0400) Subject: Merge branch 'master' of github.com:FreeRDP/FreeRDP into winpr X-Git-Tag: 1.1.0-beta1~267^2~3^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=274ee51a7a054d08b8858fc4e983184e30d08029;p=platform%2Fupstream%2Ffreerdp.git Merge branch 'master' of github.com:FreeRDP/FreeRDP into winpr --- 274ee51a7a054d08b8858fc4e983184e30d08029