Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 14:06:45 +0000 (16:06 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 14:06:45 +0000 (16:06 +0200)
commit56e2833bd5d5df8e7289267b4d5d993a0cab99a2
treeb0acecd5f397ad22cfceeba79d6b699a7fe0914e
parent8960e47c24d2e9bb03c0911c59e75f29ed210285
parent2d8ad6066d59075ebb20ae880af00eaba027d5e9
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I905886417147ceb529ded43896939f65e66d7424