From: Martin Fleisz <mfleisz@thinstuff.com>
Date: Fri, 8 Mar 2013 09:57:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 1.1.0-beta1~8^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0956eafd95a22d2f03d3db2caa6e944d7595ad2f;p=platform%2Fupstream%2Ffreerdp.git

Merge remote-tracking branch 'upstream/master'
---

0956eafd95a22d2f03d3db2caa6e944d7595ad2f