Merge branch 'wip-MDL-48377-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 1 Dec 2014 01:02:08 +0000 (14:02 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 1 Dec 2014 01:02:08 +0000 (14:02 +1300)
1  2 
mod/forum/lib.php
mod/forum/tests/mail_test.php

Simple merge
Simple merge