Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 27 Mar 2013 13:31:23 +0000 (14:31 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 27 Mar 2013 13:31:23 +0000 (14:31 +0100)
commit91d8066dfecbc9fa17d8d9ec0709ce073fc5e227
tree5021e1bad24805019cfae38eb0be8aac16b1f3fc
parent27ad55073c776b2bcb548ee2a15d166b077e5e0e
parent9c79ef0046c550614964afb8feb734c96853691c
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ie20ac6e6760ecc3a1b0147db78d40d9d69c21479