Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 24 Jul 2013 08:09:17 +0000 (10:09 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 24 Jul 2013 08:09:17 +0000 (10:09 +0200)
commit84871192077c18bb093c6259339200bd22d64f00
tree976e0579880d475f6bada6cda41d612db4733a60
parent117da3c1e6f14494693a2ffd96b415ffacc1a05c
parentc3c943545eb7f084da314486524e8c9bb2fab431
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev