Merge branch 'MDL-51637-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Oct 2015 09:08:27 +0000 (17:08 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Oct 2015 09:08:27 +0000 (17:08 +0800)
1  2 
mod/forum/lib.php

Simple merge