From: Benoit LeBlanc <benoit.leblanc@awakecoding.com>
Date: Mon, 28 Apr 2014 14:11:25 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/awakecoding/FreeRDP
X-Git-Tag: 1.2.0-beta1+android7~21^2~34^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72a9a9256447bb78cdf39d9b19d3e504829e44f5;p=platform%2Fupstream%2Ffreerdp.git

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

72a9a9256447bb78cdf39d9b19d3e504829e44f5