Merge branch 'MDL-48061-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 5 Nov 2014 08:54:32 +0000 (16:54 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 5 Nov 2014 08:54:32 +0000 (16:54 +0800)
1  2 
mod/forum/lang/en/forum.php
mod/forum/lib.php

Simple merge
Simple merge