Merge branch 'MDL-48309-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 30 Nov 2014 22:10:25 +0000 (11:10 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 30 Nov 2014 22:10:25 +0000 (11:10 +1300)
1  2 
mod/forum/lang/en/forum.php
mod/forum/lib.php
mod/forum/subscribe.php

Simple merge
Simple merge
Simple merge