Merge branch 'MDL-51214-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 17 Feb 2016 07:58:15 +0000 (07:58 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 17 Feb 2016 07:58:15 +0000 (07:58 +0000)
1  2 
mod/forum/lang/en/forum.php

Simple merge