Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:29:21 +0000 (16:29 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:29:21 +0000 (16:29 +0200)
Change-Id: Iaadfcd68fec91611b6341860e41a70b9023719de


Trivial merge