Merge branch 'MDL-22937_message_html2' of git://github.com/andyjdavis/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 6 Aug 2012 08:23:05 +0000 (16:23 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 6 Aug 2012 08:23:05 +0000 (16:23 +0800)
1  2 
mod/chat/lib.php
mod/chat/locallib.php

Simple merge
Simple merge