From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Wed, 10 Apr 2013 08:00:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/stable' into dev
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=5bf33901429e64ab91f30037e25ec04aab4b4c11;p=konrad%2Fqtdeclarative.git

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

Change-Id: I958754b1f51ecdaf465faa7700d4e57f2df926fc
---

5bf33901429e64ab91f30037e25ec04aab4b4c11