Merge branch 'wip-MDL-19147-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 7 Dec 2011 01:20:48 +0000 (14:20 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 7 Dec 2011 01:20:48 +0000 (14:20 +1300)
1  2 
mod/forum/lang/en/forum.php

Simple merge