Merge remote-tracking branch 'origin/release' into stable v5.1.1
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 28 Jun 2013 17:19:53 +0000 (19:19 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 28 Jun 2013 17:19:53 +0000 (19:19 +0200)
commit904d8b8825aa82dbc6b888968f983ba6aa339832
treea2979ec732eb9b896333d960b0a8cf1f9c87756a
parent91f936a862644c7ca7a1762ad05cc91d263b808e
parentca1ac7634f00b845ded92b5fabfa0d1c53197b01
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I0f02afa89f6f97bd8685ad525315df8736731a5e