Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 27 Mar 2013 13:31:16 +0000 (14:31 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 27 Mar 2013 13:31:16 +0000 (14:31 +0100)
commit962cd96ca30d26d3004afdff93a9a60d8b220e3c
tree5d0bdcd7b190afef3cb5067e3b16dd7630297133
parentdb4289240d1f031a218871bb78a2da59e58f7244
parent23a1dc28177638fdf64a8accad52dc4dd7e5ba2a
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ifad82383380e8a26204ebd0d5543c9a8ab338601