Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Jun 2013 12:45:17 +0000 (14:45 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Jun 2013 12:45:40 +0000 (14:45 +0200)
commita196fc62304ae23e68f60ae85a6106692f419f98
tree3d278cb45516a1631ae6969d7f95563404747fda
parent2e0e26d00d55ad2b16a5fa7441314acc2c407124
parent37257d4be0cab8d5a92db9566f89ac115645f81f
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ie3ca435442bcaab4d77fee973b82967741055628