Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 19 Feb 2013 13:33:13 +0000 (14:33 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 19 Feb 2013 13:33:13 +0000 (14:33 +0100)
commit97724fb418a507eea6b7c88857c1b300fd0d3515
tree60ab953c4d361d1795682a00c7fb7d483f734f8d
parentb7a1d6e041d98e9fb296fb7618c5a82f5b86a442
parent4d99e5bb809bffbbfd3fb5e6bad34afd991beb1e
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev