Merge 'release' into stable
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Wed, 19 Dec 2012 18:38:21 +0000 (19:38 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Wed, 19 Dec 2012 18:39:43 +0000 (19:39 +0100)
commite24d7de7874bbe66fcb951dfbf6b1fe8b1587a8f
tree1b0472feadfb716d811703bb8e3438251a87ab6d
parent5c8930fadd5c1867d36eb8a4b6e73ac8e270b5b5
parent20a88228e2675b4c6ba3f2474fa6f2143032a4bb
Merge 'release' into stable

Change-Id: Ie325bf13e34736edf4118c8ee640e23b2f9270bf