Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 29 Aug 2013 12:09:21 +0000 (14:09 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 29 Aug 2013 12:09:21 +0000 (14:09 +0200)
commit9f77554d6667f5c5dc6e172f3d1dee2277e33917
tree226e40f102b878dbce179ebfb470aae90b2f4a99
parent32f2b998df955d9b20b12defd25fd80c775b4e02
parent9be5e9c3b84b746100f21368f28de04cf7735e37
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev