Merge branch 'stable' into release
authorJohanna Aijala <johanna.aijala@digia.com>
Thu, 21 Feb 2013 07:17:06 +0000 (09:17 +0200)
committerJohanna Aijala <johanna.aijala@digia.com>
Thu, 21 Feb 2013 07:21:34 +0000 (09:21 +0200)
commitd9e4b5c1820e62700756ede2ef5290baccc3c1b2
treecc6975c1bd3ea86e4b7e5373560603e5165b7ff4
parentf4d4689d3c09cb4eae30be892be426d4fa185ed4
parentfb7ab18fa799032f37fd6f78ab34b76aff91ed6c
Merge branch 'stable' into release

Change-Id: I13e80072db1e2c14a37b6a123276be81b085e87e