Merge branch 'MDL-52928-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 03:34:04 +0000 (11:34 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 03:34:04 +0000 (11:34 +0800)
1  2 
message/lib.php

diff --cc message/lib.php
Simple merge