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

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

Change-Id: I8b0be891402530e38efca46f7cbb679eca5d4a9d
---

c704226b6815df4d989142729bae9fadd14f6f9d