Merge branch 'MDL-58497-master' of git://github.com/ankitagarwal/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 4 May 2017 02:58:36 +0000 (10:58 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 4 May 2017 02:58:36 +0000 (10:58 +0800)
1  2 
mod/forum/lib.php

Simple merge