Merge branch 'stable' into release
authorJohanna Aijala <johanna.aijala@digia.com>
Thu, 21 Feb 2013 07:24:10 +0000 (09:24 +0200)
committerJohanna Aijala <johanna.aijala@digia.com>
Thu, 21 Feb 2013 07:26:24 +0000 (09:26 +0200)
commite627e2f819babd27523ad0c35ae4185560e791a5
tree6f0ebab6c21434cbf91ed70911646d5345666710
parent1829dc82cac3657c31c7c5455f8d9d84540eec8f
parent5717e881ae7246e3ab2e1df12af73378ebaad824
Merge branch 'stable' into release

Change-Id: Icb76f5934f37e90c0aec1524f5fe0b23add59c15