Merge remote-tracking branch 'origin/release' into stable
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Mon, 18 Mar 2013 13:04:16 +0000 (14:04 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Mon, 18 Mar 2013 13:04:40 +0000 (14:04 +0100)
commit3e7042fb70597150a137e2e449b67e759d45c3fe
tree22df07a04f15f6aaedfd9fffc2fde827bec8322a
parentc8f1258628657baca02bf0c6b84a4bbfb08251e4
parent9efbd143281e7f657b4e1415b5bdcad28f5c335c
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I03081121451c40b7103f8d17d3a3acea370f7528