Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 13 Feb 2014 11:14:57 +0000 (12:14 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 13 Feb 2014 11:14:57 +0000 (12:14 +0100)
commite19807fe882d5d948048beb90773d3b1765f1359
treec3b2cfd20ade6b63183dbca94b4871873dba58a5
parent9786e56518be83cc4092c4c1a8cca31acd018fb8
parent454b904f1e67d913d392abad764e6ae919bf9907
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev