Merge branch 'MDL-57550-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Jan 2017 06:57:53 +0000 (14:57 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Jan 2017 06:57:53 +0000 (14:57 +0800)
1  2 
mod/forum/lib.php

Simple merge