Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 23 Dec 2013 14:37:30 +0000 (15:37 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 23 Dec 2013 14:37:31 +0000 (15:37 +0100)
commit8827ca857101c64bd797197876746edd76cb20c8
treeaa4c8fd76a07cfc3860c7d8ae7f8f0192ba27229
parent967e0eb22f8e85db185d093b95da57e3ec41e7cc
parenta0df6c38364c87001258fe9f2375a2bd34ce4cfc
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I0429a7186bef08918b777d6aa662685c57bad091