Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:52:00 +0000 (19:52 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:52:00 +0000 (19:52 +0200)
commit34467db6c30807a5f5979e7f2807e7b4f8cfb469
treebeb3cecc628302ca8dcb830b2677889d0993827e
parent007a1b71fb922efddff6a8f4ff81311f2fed622d
parentfede66578dbd670068eea21342ccb54669cc91b4
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf
sync.profile

Change-Id: Ib2c94071cee5846db9b16ee4d3e9aeb897e9070e