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

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

Change-Id: I4804a63ccf83eb63fd7b4fe19be7953ef80138d5
---

cb3944084bdc67fbb93d2bb2677113725860acfd