Merge branch 'w20_MDL-32915_m23_chatdiv' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 06:06:37 +0000 (14:06 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 06:06:37 +0000 (14:06 +0800)

Trivial merge