Merge branch 'MDL-46929' of https://github.com/andrewhancox/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Apr 2017 02:00:58 +0000 (10:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Apr 2017 02:00:58 +0000 (10:00 +0800)
1  2 
mod/forum/lib.php

Simple merge