Merge branch 'stable' into release
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Wed, 20 Feb 2013 18:44:06 +0000 (19:44 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Wed, 20 Feb 2013 18:44:26 +0000 (19:44 +0100)
commit27f669819921e84d10372b760e2ac311c240a8c4
tree4c73e5f57e5688130ec942206e7a8374a06d464a
parentb2b83f01312e945237aa1aacadd4476133bf4038
parent9d239dec489dc8a9704de678e5b0e18cf40a3990
Merge branch 'stable' into release

Change-Id: I22c0135ec655c7b18eeca5e26473bd0ddbbd9213