Merge branch 'stable' into release
authorJohanna Aijala <johanna.aijala@digia.com>
Thu, 21 Feb 2013 07:38:02 +0000 (09:38 +0200)
committerJohanna Aijala <johanna.aijala@digia.com>
Thu, 21 Feb 2013 07:39:00 +0000 (09:39 +0200)
commitff8399920bbe272e573782e9b134e13f1726edb9
treec84deaee9e240543eebd19a5e96e062a5ed141f5
parent206897d96f337f139870a2eaf173543898e7cc29
parent98cbd8ba0b1b91206ddd9cbf88ed4fc255e9aeb8
Merge branch 'stable' into release

Change-Id: I29715c906d4d4dee985fdcfbae9a5d99c1a17997