Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorSimon Hausmann <simon.hausmann@digia.com>
Tue, 24 Dec 2013 09:33:07 +0000 (10:33 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 24 Dec 2013 09:33:07 +0000 (10:33 +0100)
commit751fa46df9bf06a1003df34b3e74c73c079e8626
tree1de5e2588702bf8c29030fdfc55115caaa3ff2e2
parent70004585f89f325f398c556d101bfa1833d87b53
parentd588ec795bf905d6d4a4827ad74f3d01315e40bf
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev