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


Trivial merge