From: Marc-André Moreau <marcandre.moreau@gmail.com>
Date: Fri, 19 Sep 2014 18:39:43 +0000 (-0400)
Subject: Merge branch 'shadow' of github.com:awakecoding/FreeRDP
X-Git-Tag: 2.0.0-beta1+android10~806^2~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72e7507bee5d239300a0535e73172ff585c4f829;p=platform%2Fupstream%2Ffreerdp.git

Merge branch 'shadow' of github.com:awakecoding/FreeRDP

Conflicts:
	libfreerdp/core/capabilities.c
---

72e7507bee5d239300a0535e73172ff585c4f829