Merge branch 'MDL-46391-master' of https://github.com/DmitryNefedov/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 21:45:23 +0000 (10:45 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 21:45:23 +0000 (10:45 +1300)
1  2 
message/lib.php

diff --cc message/lib.php
Simple merge