Merge branch 'MDL-55632-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 17:12:26 +0000 (19:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 17:12:26 +0000 (19:12 +0200)
1  2 
mod/forum/lib.php

Simple merge