Merge branch 'stable' into release
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Wed, 20 Feb 2013 18:41:41 +0000 (19:41 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Wed, 20 Feb 2013 18:41:57 +0000 (19:41 +0100)
commita7ae915601eae8b147f093f3c9f4fa7fe069275c
treecd9a6cba3ece55455d157dfe3a644fad9dee5983
parent6bdc8e067289ec168582ed0fea06588240e22fd6
parentc8f1258628657baca02bf0c6b84a4bbfb08251e4
Merge branch 'stable' into release

Change-Id: I60bd4e3d7ed8aa09c6606fb0476fa34f882cb8e3