From: Marc-André Moreau Date: Tue, 13 Nov 2012 01:49:20 +0000 (-0500) Subject: Merge branch 'master' of github.com:FreeRDP/FreeRDP X-Git-Tag: 1.1.0-beta1~29^2~59^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=82725a2df7f503af9e8334a066381ab82bf381e1;p=platform%2Fupstream%2Ffreerdp.git Merge branch 'master' of github.com:FreeRDP/FreeRDP --- 82725a2df7f503af9e8334a066381ab82bf381e1