Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:15:09 +0000 (16:15 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:15:26 +0000 (16:15 +0200)
commita2457771ed7c4ab533a7d2a00c9e26661c3062db
tree858a378c3ddb70421266c463d3e91ddf653450a0
parent5d4b006181d009e6245d5d38c7798603ddcab06a
parent24947fb8cc1859d5d193b2d66746c1541f30ab9b
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I6bd61ebda17c34f51a4c4ece4852ab144bf542a6