From: Marc-André Moreau <marcandre.moreau@gmail.com>
Date: Tue, 19 Feb 2013 01:07:41 +0000 (-0500)
Subject: Merge branch 'master' of github.com:awakecoding/FreeRDP
X-Git-Tag: 1.1.0-beta1~11^2~60
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4e565e26b5d50de35d84d1361e6d49191714f325;p=platform%2Fupstream%2Ffreerdp.git

Merge branch 'master' of github.com:awakecoding/FreeRDP
---

4e565e26b5d50de35d84d1361e6d49191714f325