Merge branch 'MDL-4781-master' of https://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 6 Jan 2013 22:14:47 +0000 (11:14 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 6 Jan 2013 22:14:47 +0000 (11:14 +1300)
1  2 
mod/forum/lib.php

Simple merge