Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorSimon Hausmann <simon.hausmann@digia.com>
Tue, 18 Feb 2014 09:02:27 +0000 (10:02 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 18 Feb 2014 09:02:27 +0000 (10:02 +0100)
commit2528fce0a8d40772534cb03cd47e7db306327f15
tree9f68b5db36d78177cd89d836cdadd4822e9d083f
parentf97f339f0bebceb00c01cc92acdbe045506c81c8
parentba9ca0e3d64c46fc63cdbc62f3e4a96e36a842f8
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev