Merge branch 'MDL-35514_master' of https://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jun 2014 16:19:52 +0000 (18:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jun 2014 16:19:52 +0000 (18:19 +0200)
1  2 
mod/forum/lib.php

Simple merge