Merge branch 'MDL-45594_master_alt' of git://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 21 Jul 2014 23:12:09 +0000 (11:12 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 Jul 2014 23:12:09 +0000 (11:12 +1200)
1  2 
message/lib.php

diff --cc message/lib.php
Simple merge