Merge branch 'MDL-39770_chat' of https://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 08:34:18 +0000 (16:34 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 08:34:18 +0000 (16:34 +0800)

Trivial merge