Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:51:44 +0000 (19:51 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:51:44 +0000 (19:51 +0200)
commit12450d0eca12cdefa668e068817286f5983aa96d
tree2d0127d05babbdca3570303897327408602485a7
parente44e545ccfc6e6ed2847497bc09c6497e364cc98
parentcb98d9513e9612ce9af846e625caedfe6af9cc9c
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf
sync.profile

Change-Id: I0c7564e03a51df9aba7dd53640802e318417bd0e