Merge branch 'MDL-30202' of git://github.com/rwijaya/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 30 Nov 2011 07:36:14 +0000 (15:36 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 30 Nov 2011 07:36:14 +0000 (15:36 +0800)
1  2 
mod/forum/index.php
mod/forum/lib.php

Simple merge
Simple merge