Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:01:36 +0000 (16:01 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:01:36 +0000 (16:01 +0100)
commit68a98516d01a93ca5e831a6ec2bdf6a7fc1b2254
treea152ca64d2922cbc6b1d36dc88f78a20c5c736d0
parent91f124cfc23442cc0aca23df9b71f3e561706178
parentda033ca3eb390539720674e843015a5c7601e0b2
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I6e1ef2cfdde5dc34d6971bfd6ed89c6102daf679