Merge branch 'release/2.4.2' into next
authorMarius Mathiesen <marius@gitorious.org>
Tue, 27 Nov 2012 13:49:15 +0000 (14:49 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Tue, 27 Nov 2012 13:49:15 +0000 (14:49 +0100)
commit46e7c9dd1e32d844ad5ed33faf17617ea9228ef3
treeafef5c8d9465f4a786248ed545d897d9301b1507
parenteef5a92f734ea8e5638f4220d06291270fb690eb
parent24847fdfbe9d403836bcf5c0db83751300a19259
Merge branch 'release/2.4.2' into next