Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:19:07 +0000 (16:19 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:19:07 +0000 (16:19 +0200)
commitab46573f99a23240ac0f822112a6fb9c567e541c
treebe2371e112d51cc40f2eeaabe8a52abd64c295a8
parenta85df53ba66be439d775abbe9280ddcffd45d05c
parentd403785d9bc5ce27d1aa28ab68200a97a8bffcf5
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I6e22c4ce74e71c41ff43eb0403dab7193df4d0d8