Merge branch 'MDL-35385_chat_23' of git://github.com/andyjdavis/moodle into MOODLE_23...
authorDan Poltawski <dan@moodle.com>
Tue, 30 Apr 2013 13:08:32 +0000 (14:08 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Apr 2013 13:08:32 +0000 (14:08 +0100)

Trivial merge