Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 5 Dec 2013 17:45:33 +0000 (18:45 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 5 Dec 2013 17:45:33 +0000 (18:45 +0100)
Change-Id: I9c1abddf20e85cc0f29f2da26c398b7180e4f479


Trivial merge