Merge branch 'MDL-52930-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 9 Feb 2016 10:06:10 +0000 (18:06 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 9 Feb 2016 10:06:10 +0000 (18:06 +0800)
1  2 
mod/forum/lib.php

Simple merge