Merge "Merge branch 'dev' into stable" into refs/staging/stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 22 Mar 2013 12:16:59 +0000 (13:16 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 22 Mar 2013 12:16:59 +0000 (13:16 +0100)
commit503eec194ea8bc70bfdbfd06bd0832a77cfcc137
tree6b32fb2c0d59f2efac71432fe3509af0aad2b8b0
parent99eac6e3fb53dc1ca6f8136a02f93c33be3ef52f
parentd815621963cee5571ed93fb89561c4884a685b6b
Merge "Merge branch 'dev' into stable" into refs/staging/stable