Merge branch 'MDL-51782_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Oct 2015 03:50:57 +0000 (11:50 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Oct 2015 03:50:57 +0000 (11:50 +0800)
1  2 
mod/forum/lib.php

Simple merge