Merge branch 'wip-MDL-30273-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 29 Nov 2011 03:46:47 +0000 (16:46 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 29 Nov 2011 03:46:47 +0000 (16:46 +1300)
1  2 
mod/forum/lib.php

Simple merge