Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:08:31 +0000 (16:08 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:08:31 +0000 (16:08 +0100)
commitc242216d99f76443f3fe9160d15d78f06f7ff406
treeb55b470c20bda9f9d9f9052fc5a02bccbabc4d56
parentc617e2a25aca6cb95ab9d1a7cc55b363a12e861e
parent48c1382c33b77b002c1b295b9d2d6c4987526add
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I9f566e48b319664f2783788572935da39749c91c