From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Fri, 29 Nov 2013 15:08:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/stable' into dev
X-Git-Tag: upstream/5.2.90+alpha~71
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4fc75135019ac6b57203ea76f6f4f16e73c74850;p=platform%2Fupstream%2Fqttools.git

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

Conflicts:
	.qmake.conf

Change-Id: I8d55441489d74fdf75f140efcb6e09f77ada2082
---

4fc75135019ac6b57203ea76f6f4f16e73c74850