Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 12 Mar 2013 10:31:49 +0000 (11:31 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 12 Mar 2013 12:15:36 +0000 (13:15 +0100)
commit403e829f9dd4ad981c589b1f1e943a5bfbb9b1f9
treee5de6a58c65bd077a13d7b232555530a367a6608
parente747d4c0cd09c0874c7a268b06dd45fadb1111aa
parent0f9ae06f317d3aab07b35010a11ef0658afbec22
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ia4e3edead13e2526a77133e7067e649784fd1358