Merge branch 'release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Thu, 31 Jan 2013 14:58:33 +0000 (15:58 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Thu, 31 Jan 2013 14:59:31 +0000 (15:59 +0100)
commit7556b5dcd50fff75102b99dca6227ad8932e9d14
tree78b6c414cde81c17de6a1753ad73ca98f6166d22
parentce0de1819ac3aad1d7da9e7bcfd99331fcc23dd7
parentb2b83f01312e945237aa1aacadd4476133bf4038
Merge branch 'release' into stable

Change-Id: I998366d4282fc57df849ea2a710725d30ac294a6