Merge branch 'release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Thu, 31 Jan 2013 15:07:08 +0000 (16:07 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Thu, 31 Jan 2013 15:07:17 +0000 (16:07 +0100)
commit8ec866c210b8fa41db3b2e9aaa1e7c2ce1dfbe5c
tree894510793c22cab5be84cca5a295dd95054b2944
parent5391ecd599858a416999e3e7bb367653edf89383
parent059802d705b2adda8ccacdf1948d05a918d8a9ef
Merge branch 'release' into stable

Change-Id: I8824856bf88d79c94971e621e04d00b8aa502e14