Merge branch 'MDL-9070' of git://github.com/aolley/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 30 Sep 2015 01:29:55 +0000 (09:29 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 30 Sep 2015 01:29:55 +0000 (09:29 +0800)
1  2 
mod/forum/lib.php

Simple merge