Merge branch 'MDL-26562-23' of git://github.com/vadimonus/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 23 May 2012 23:00:09 +0000 (11:00 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 23 May 2012 23:00:09 +0000 (11:00 +1200)
1  2 
mod/forum/lib.php

Simple merge