Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 16 Dec 2013 15:26:20 +0000 (16:26 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 16 Dec 2013 15:26:20 +0000 (16:26 +0100)
commitdd7fd6f8760f14081648860715fb320cbc3bb7dd
tree1a92a0b7d75ce14629eb72a85950ad65c4d6385f
parent68f2a053e7ae67540ee557b5832f74361f3826f4
parent40c371c0deac92e46cdc3302d00ab304bcbca505
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ic22a6afb0f21d6b716e17cf11d33e56fa873880e