Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:20:59 +0000 (17:20 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:20:59 +0000 (17:20 +0100)
commit422099e8ddeddc0631db3a369e3c52f0ffe2f455
treea38d0a77e8082c52072e9054b4399090405fcf31
parent16aadf964dcdb71733414afdc7a548ca1ac58f97
parent88ef2bf83de18542428151553cbfa87de2469c90
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: Id367a610a3aefd288bfe287a3bf64606e582deb9