Merge branch 'wip-mdl-29534' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Jan 2013 06:59:22 +0000 (14:59 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Jan 2013 06:59:22 +0000 (14:59 +0800)
1  2 
mod/forum/lib.php

Simple merge