Merge branch 'release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Thu, 31 Jan 2013 14:53:33 +0000 (15:53 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Thu, 31 Jan 2013 14:56:27 +0000 (15:56 +0100)
commit17626e935cbb477f93fc43082af5744731614e3a
tree987abb00565fdd40620589ff5e53b6128612d183
parent0321486f20b67d3d0befce30c9ad1b0862b5a346
parent1829dc82cac3657c31c7c5455f8d9d84540eec8f
Merge branch 'release' into stable

Change-Id: I925f12d3a45bfaef51387b194da9d48605ee346d