Merge branch 'release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Thu, 31 Jan 2013 14:18:26 +0000 (15:18 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Thu, 31 Jan 2013 14:18:46 +0000 (15:18 +0100)
commit4e9ba281d9ff0ee7b28085744b96b4714afd1bdf
tree43d26c239e1996ba53b4518a382700eb56ef795f
parentb5366d0fa77bf219a26023a463c1b8045c7d306f
parent7d957bda7bb7fc0d2f79cd4468abf47e1497075b
Merge branch 'release' into stable

Change-Id: I4c6c9ec0868de12f01b5a91a8d21ca441bb192a1