Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 14:06:28 +0000 (16:06 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 14:06:28 +0000 (16:06 +0200)
commitb92e2673f1896be9dfe10b512143d6e1b4ff72f7
treed23b331596a94364654d1fbf59f6ed2dd5b8fd95
parent23a1dc28177638fdf64a8accad52dc4dd7e5ba2a
parenta567c47b3785fafb51c6db0f660c3af198968271
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I76fa4a12697fae965069e02e860333e403b67aed