Merge branch 'MDL-31458' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 15 May 2012 21:12:17 +0000 (09:12 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 15 May 2012 21:12:17 +0000 (09:12 +1200)
1  2 
mod/forum/lib.php

Simple merge