Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>
Fri, 1 Mar 2013 19:41:01 +0000 (20:41 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 1 Mar 2013 19:41:01 +0000 (20:41 +0100)
commited55586b82f51629c153f34dd1964e84c639b4dd
tree20b1eb49ec13c00041f2cdf5117d79393537f261
parent4261de84806cfe90ba628b015cbdaf15a7cfeda0
parent6bbde42f229a0613fe7198ee82dcbb57b252b364
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev