Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 17 Feb 2014 10:17:26 +0000 (11:17 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 17 Feb 2014 11:33:27 +0000 (12:33 +0100)
commitf6c92aacb32721a4a22bd803e53c7a4d3dc2635f
treee4475f949df76e1b36a751dcb1ec92efae814820
parent251c020bbc5594f88b0dfab9b73afa28d8743754
parent047191f1d23b27cf68e8f0db24ff918fb465b70b
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev