Merge branch 'MDL-36929_new_discussions' of https://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 01:21:39 +0000 (14:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 01:21:39 +0000 (14:21 +1300)
1  2 
mod/forum/lib.php

Simple merge