Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorDavid Faure (KDE) <faure@kde.org>
Wed, 23 Jan 2013 17:34:01 +0000 (18:34 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 23 Jan 2013 17:41:57 +0000 (18:41 +0100)
commit0e856d7cb5280f19e93a0738a2eb11f70cf9f119
tree5132ff2f9b4040fed2f31eb9e8c79387d989d065
parentb700796884d29f1947194553c0103b5390b6bd42
parent44b7d97d565677d6decbef2d010709bdb3d7cbd4
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev