Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 7 Jan 2014 14:15:15 +0000 (15:15 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 7 Jan 2014 14:15:15 +0000 (15:15 +0100)
commitb0481d4b47f96b157989203bf57ec7e8ca266513
tree79c4e627a1973350af18be8a0a5fac44b456e30f
parent4050cdf66d06c5492f3459f8cd4defa1bf434f7e
parente236de90c27acf7ef3b2d301f2f5cab958d791ef
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev