Merge branch 'MDL-32665_chat_popup_23' of git://github.com/andyjdavis/moodle into...
authorAparup Banerjee <aparup@moodle.com>
Mon, 23 Jul 2012 02:21:44 +0000 (10:21 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 23 Jul 2012 02:21:44 +0000 (10:21 +0800)

Trivial merge