From: Hardening <rdp.effort@gmail.com>
Date: Sun, 14 Apr 2013 13:46:23 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/FreeRDP/FreeRDP
X-Git-Tag: 1.1.0-beta1+android4~1^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=129614ff6c97a794d2544cbef15ac669d6218689;p=platform%2Fupstream%2Ffreerdp.git

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

129614ff6c97a794d2544cbef15ac669d6218689