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

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

Conflicts:
	src/quick/doc/src/appdevguide/porting.qdoc
	sync.profile

Change-Id: Iec5516c596c3eca60a3e6ceb1d45f2a7a1595c12
---

ba0899542cf03a685335bf4e02edfb377bade224