Merge branch 'MDL-39770_chat' of https://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 22 Jul 2013 23:06:08 +0000 (11:06 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 22 Jul 2013 23:06:08 +0000 (11:06 +1200)

Trivial merge