Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 24 Oct 2013 10:56:32 +0000 (12:56 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 24 Oct 2013 10:56:32 +0000 (12:56 +0200)
commitb2324a4cad0ea35ac9f531a4a21855bf87ee7b8d
treec94c530d71422da099ac96c794c050004a7b8df3
parentfa83f167c3039068b3f7539574c1f8f21baed690
parent860dd2acb930d87a4a7ec47cdd8bca9d7a113c77
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Id16c15342567b021bc9d208d830eed4ccf33e9d3