Merge branch 'MDL-3714-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 20:39:01 +0000 (09:39 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 20:39:01 +0000 (09:39 +1300)
1  2 
mod/forum/lib.php

Simple merge