From: Marc-André Moreau Date: Tue, 11 Feb 2014 01:22:44 +0000 (-0500) Subject: Merge branch 'master' of github.com:FreeRDP/FreeRDP X-Git-Tag: 1.2.0-beta1+android7~108^2~39 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ba0360f408a2240638198e3003b7143f6da93978;p=platform%2Fupstream%2Ffreerdp.git Merge branch 'master' of github.com:FreeRDP/FreeRDP --- ba0360f408a2240638198e3003b7143f6da93978