Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 5 Apr 2013 14:01:51 +0000 (16:01 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 5 Apr 2013 15:21:40 +0000 (17:21 +0200)

Trivial merge