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

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

Change-Id: I140852ef7fbbfe303dac620af5e6eba5ee3a4b02
---

c1832b78d484ab76afc7baf494c556c7dba32677