Merge branch 'MDL-41851-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Feb 2015 11:36:00 +0000 (12:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Feb 2015 11:36:00 +0000 (12:36 +0100)
1  2 
mod/forum/lib.php

Simple merge