Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:40:36 +0000 (19:40 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:40:36 +0000 (19:40 +0200)
commit96adb952c82fd70c29f0c3665f5d111003b54ed9
treee73167bea05b27aa0c156946e98442c9c893260d
parenta2db9407b8dd22c1ad3eff4df584f2d984b203d1
parent587e64025f77242cc1f2e756346f24e810595513
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf
sync.profile

Change-Id: I304d68e33d4d54dd803163363c36d69f4ab4a5aa