Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorJ-P Nurmi <jpnurmi@digia.com>
Tue, 9 Jul 2013 12:01:27 +0000 (14:01 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 9 Jul 2013 12:01:27 +0000 (14:01 +0200)
commit68b2f86919546a5f4d998f8ababd5d0b5fb8dfa2
treefe4b2fbea6d388fbb62a7d887cd516b143f48733
parentddcf9fc80e074c5a9d1ecbbf3c60ca27f250ce98
parent81077291e3ae1fe8819cf58471ee09ad66c9cad1
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev