Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorSimon Hausmann <simon.hausmann@digia.com>
Wed, 5 Feb 2014 08:05:32 +0000 (09:05 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 5 Feb 2014 08:05:32 +0000 (09:05 +0100)
commit8cbfd88f8db3117c52eab676f9153b09fe3fae62
treebdd690c075d0dcf062a82b069338b79cf2831ae0
parent51ea13df520965fadf716d91c0320956cb844a76
parent42c568edebcee89dcf14a87c559bc142d7064ff0
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev