Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:46:58 +0000 (19:46 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:46:58 +0000 (19:46 +0200)
commit3651d51982b2421c21ae80767057586cb823e2c2
tree845ef00ad40d8f5472ded51bbbc2d409aeb57513
parente77e64aff2134dd2f8884068fcf13a965b7c7b3f
parent2e0e26d00d55ad2b16a5fa7441314acc2c407124
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf
sync.profile

Change-Id: I8f788167e37c9b9ca3f4a59a9785a435eeaa6317