Merge branch 'release/2.4.2'
authorMarius Mathiesen <marius@gitorious.org>
Tue, 27 Nov 2012 13:48:54 +0000 (14:48 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Tue, 27 Nov 2012 13:48:54 +0000 (14:48 +0100)
commitb50c6c39742195bf9329df25c2540f2435f7071e
treeafef5c8d9465f4a786248ed545d897d9301b1507
parentc58478f94a597d86b00a677d2250c6a65bb289e0
parent24847fdfbe9d403836bcf5c0db83751300a19259
Merge branch 'release/2.4.2'