Merge branch 'MDL-57639-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 24 Jan 2017 10:11:30 +0000 (10:11 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 24 Jan 2017 10:11:30 +0000 (10:11 +0000)
1  2 
mod/forum/lib.php

Simple merge