Merge branch 'MDL-25616_recent_messages' of git://github.com/andyjdavis/moodle
Conflicts fixed: message/index.php message/lib.php
This diff is collapsed.
Please register or sign in to comment
Conflicts fixed: message/index.php message/lib.php