Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 11 Apr 2014 12:17:49 +0000 (14:17 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 11 Apr 2014 12:17:49 +0000 (14:17 +0200)
Change-Id: Iff68a7da2065b64579032f1be8eaf5fb097d58bb


Trivial merge