Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 10 Jan 2014 17:30:14 +0000 (18:30 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 10 Jan 2014 17:30:14 +0000 (18:30 +0100)
commitd2545bd40f0a4150f616f52b9138a34c60ed2d3c
treee9e76ae976a20a22ff400a1cdd0650bf90da45b9
parentb0481d4b47f96b157989203bf57ec7e8ca266513
parentda89319f3859b30cf4cf03a53b50677092138921
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I7dc36a224702721b67ffa2cf7f9ce2a6b047f88e