Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorStephen Kelly <stephen.kelly@kdab.com>
Thu, 11 Apr 2013 13:09:39 +0000 (15:09 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 11 Apr 2013 13:09:39 +0000 (15:09 +0200)
commita13b4dbb32bf3c022cae7f1e9e3c792a8140543b
tree647417e5550f432b19ceca31891a1f8cbee6893d
parent97c2eefbdce918053254f3c63f680b02a6793c2d
parent9213ec1d4872051210d9d59e78adc84a5942e00e
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev