Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 6 Jan 2014 16:14:48 +0000 (17:14 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 6 Jan 2014 18:15:55 +0000 (19:15 +0100)
commit7200ac28025e5d60b540f97cad360d2fc7cf3872
treee15ae3c904bb9e120ad5c1523e7c4da8229a14bc
parent9220ab45e2b76a839955d1d0180fdd08df97e6fd
parent2b502b55922a908126f820ae48a479f28eba80ba
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev