Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 5 Dec 2013 17:46:35 +0000 (18:46 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 5 Dec 2013 17:46:35 +0000 (18:46 +0100)
commit68f2a053e7ae67540ee557b5832f74361f3826f4
treeef19616bd261a3ba57c298746c5b229514bf97bc
parentc242216d99f76443f3fe9160d15d78f06f7ff406
parent4ef1b438ba70b629655fe8e0eec0554968503f34
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I21c9fc2f8a0da8410b168f5582849208f188f325