Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 29 Apr 2013 12:19:29 +0000 (14:19 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 29 Apr 2013 12:19:29 +0000 (14:19 +0200)
Change-Id: I0f0457e9863f540b7bd8bc104c92891d8cf5c483


Trivial merge