Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 12 Dec 2013 17:04:29 +0000 (18:04 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 12 Dec 2013 17:25:34 +0000 (18:25 +0100)

Trivial merge