Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 6 Jun 2013 08:05:09 +0000 (10:05 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 6 Jun 2013 08:05:09 +0000 (10:05 +0200)
commitbe71d16be5650e25c208db4d4c7c77f849e25864
tree2e450d724a6279f3c679f2c540688e4735769494
parent37ec5822522baaa5b6e316103477d6da7e6d6a9c
parent12450d0eca12cdefa668e068817286f5983aa96d
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev