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)
commit1f3d01f169df1bc08d022e402774063e9895e8ab
tree51db0232b24842973b5f964f4abf33bb17bed04c
parent71ada5337e79e9ab55fb0bab0e54406cfe1529d6
parenta2592fecd132cfe0d57e3e3a90724fb8471011b1
Merge branch 'MDL-22937_message_html2' of git://github.com/andyjdavis/moodle
mod/chat/lib.php
mod/chat/locallib.php