Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:44:48 +0000 (19:44 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:44:48 +0000 (19:44 +0200)
commitb006ef73e5b27702d3c43f52543fc1f34300fe0e
treee39e090c9b4dc4f8a4d3e32c36c959c316861bfc
parentbb7c0257bfe3ab1478c74365476f5da72489cd2e
parentc4254a0599ed104608cdc1a94561a9fda7db2918
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf
sync.profile

Change-Id: Ica3851cfaa4844644fbbe83c2e3c58803f170501