Merge branch 'stable' into release
authorJohanna Aijala <johanna.aijala@digia.com>
Thu, 21 Feb 2013 07:30:40 +0000 (09:30 +0200)
committerJohanna Aijala <johanna.aijala@digia.com>
Thu, 21 Feb 2013 07:31:31 +0000 (09:31 +0200)
commitfb8d5f300ea30689674ce1b461b7f8d636a26332
treea7dcf294ecd847b9e5fd8eccd831a40defce5b43
parent1f2427642d2aa2e11318f7e5f968fb563f40d24b
parent2db2cde0d8433ad1aed59412717c4cddf496ba66
Merge branch 'stable' into release

Change-Id: I21911e86a651caa599110317a5e677cd61db4e86