Merge branch 'MDL-19670-master' of git://github.com/gurgus/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Mar 2015 05:45:31 +0000 (13:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Mar 2015 05:45:31 +0000 (13:45 +0800)
1  2 
mod/forum/lang/en/forum.php

Simple merge