Merge branch 'MDL-24577-master-1' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 17 Nov 2011 01:53:38 +0000 (14:53 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 17 Nov 2011 01:53:38 +0000 (14:53 +1300)
1  2 
mod/forum/lib.php

Simple merge