Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 24 Oct 2013 10:56:16 +0000 (12:56 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 24 Oct 2013 10:56:17 +0000 (12:56 +0200)
Change-Id: I15d0b9f03136840aff189ffb9de6e3899c204ca2


Trivial merge