Merge branch 'wip-mdl-29534-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorDan Poltawski <dan@moodle.com>
Thu, 17 Jan 2013 05:48:42 +0000 (13:48 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 17 Jan 2013 05:48:42 +0000 (13:48 +0800)
1  2 
mod/forum/lib.php

Simple merge