Merge branch 'MDL-48221-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 14:51:59 +0000 (15:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 14:51:59 +0000 (15:51 +0100)
1  2 
mod/forum/lib.php

Simple merge