Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>
Fri, 1 Mar 2013 19:41:01 +0000 (20:41 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 1 Mar 2013 19:41:01 +0000 (20:41 +0100)

Trivial merge