Merge branch 'wip-mdl-37633' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 07:48:33 +0000 (15:48 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 07:48:33 +0000 (15:48 +0800)
commit6af8e417c395d0d8de03146adada33c89841d6ee
treeb43939e0b8d63ca18061ab0ef5f5cf327e04eacd
parent5c70d6505a2e7ec5d94067762baa1ca06af04a96
parentafd5e85ca80c47b78a6163380fcebe1edac539e6
Merge branch 'wip-mdl-37633' of git://github.com/rajeshtaneja/moodle

Conflicts:
mod/forum/db/upgrade.php
mod/forum/version.php
mod/forum/db/upgrade.php
mod/forum/version.php