Merge branch 'MDL-53702_master' of https://github.com/liorgil/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 20 Apr 2016 03:10:23 +0000 (11:10 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 20 Apr 2016 03:10:23 +0000 (11:10 +0800)
1  2 
mod/forum/lib.php

Simple merge