Merge branch 'MDL-37669-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 27 Sep 2016 09:34:24 +0000 (17:34 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 27 Sep 2016 09:34:24 +0000 (17:34 +0800)
1  2 
mod/forum/lang/en/forum.php
mod/forum/lib.php

Simple merge
Simple merge