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

Simple merge