Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:13:17 +0000 (17:13 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:13:17 +0000 (17:13 +0100)
commit47109a1ed7bf0a8b6341bc0f1ed5409f7658e96d
tree2c87834a97817ccb4f60abf5c4d6eace58a6387f
parent713e1b66e35e08bd05b5ed0684665d068366ff7f
parenta65e88aa4eeccb3e6e3d1888d5e2e866487c851f
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I81e166011a25fca9f883937fa9ebf7fbee09e9b9