Merge branch 'MDL-45089_chat' of https://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 16 Apr 2014 05:00:46 +0000 (13:00 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Apr 2014 05:00:46 +0000 (13:00 +0800)

Trivial merge