Merge branch 'wip-mdl-23335-master' of https://github.com/deraadt/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 10 Sep 2013 04:56:40 +0000 (12:56 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 10 Sep 2013 04:56:40 +0000 (12:56 +0800)
1  2 
mod/forum/lib.php

Simple merge