Merge branch 'stable' into release
authorSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:42:07 +0000 (09:42 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:42:13 +0000 (09:42 +0100)
commit5c44a5e161794a96f63ab41037f97e6579bf5586
tree4faa0fefbc702ec105ae57cd2e5eb8208f833053
parent71089c3c8785472248c3ea61545c6f054da2de21
parentfece2474fe7915db73c7cc4cc115cdac2f636377
Merge branch 'stable' into release

Change-Id: I6ae8209211f9a294681ea04dff070543957d1053