Merge branch 'MDL-43709-master' of https://github.com/pauln/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 04:26:12 +0000 (12:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 04:26:12 +0000 (12:26 +0800)
1  2 
mod/forum/lib.php

Simple merge