Merge "Merge branch 'stable' into dev" into refs/staging/dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 6 Sep 2013 08:23:23 +0000 (10:23 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 6 Sep 2013 08:23:23 +0000 (10:23 +0200)

Trivial merge