From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Mon, 29 Apr 2013 12:17:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/stable' into dev
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=7224dd977163335d61ed4297341e6161bf1dbcf7;p=konrad%2Fqtdeclarative.git

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

Change-Id: I35f07a1725af104952f822274763dd7a96a9d560
---

7224dd977163335d61ed4297341e6161bf1dbcf7