From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Fri, 31 May 2013 11:48:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/release' into stable
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=7e73dc01f85355e23a4ee07c0b624b253541acdc;p=konrad%2Fqtdeclarative.git

Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ie4ce4c3e64f093eec26754e06199d350a46ae2a2
---

7e73dc01f85355e23a4ee07c0b624b253541acdc