Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:24:12 +0000 (17:24 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 16:24:12 +0000 (17:24 +0100)
commitd2414abe66d4db2f3c5146466cdea66615b849a7
tree1108b92bc8f5d5d387b34bd65e89f19b79ac21b9
parentaffc5f7b3b6575974ceab1928f30851981d356ac
parent281d54501ebf7088459354037b02746a7c77f3b6
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I0f21f35cbace3cacbb0b2536c8f1eb6e11f025b5