From: Marc-André Moreau <marcandre.moreau@gmail.com>
Date: Sun, 3 Mar 2013 03:25:54 +0000 (-0500)
Subject: Merge branch 'master' of github.com:awakecoding/FreeRDP
X-Git-Tag: 1.1.0-beta1~11^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60427e2aa1ae9552d795bab395135c919ac95685;p=platform%2Fupstream%2Ffreerdp.git

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

60427e2aa1ae9552d795bab395135c919ac95685