Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 24 Oct 2013 10:56:57 +0000 (12:56 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 24 Oct 2013 10:56:57 +0000 (12:56 +0200)
commitd61710d13a426bc3145254029264bd0f3887f63e
treecce820f1ebdc2c2ececabdbdb408139c94134c2d
parente931872796b9a69a607969d41b20a7ab80035970
parentac41a8cb8894108868ef91e10888a08e482767b5
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Icb0adfbb312306ea8638a59a02a45d313ecf258d