Merge branch 'MDL-28023_assignment_jabber' of git://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 28 Jun 2011 09:04:55 +0000 (17:04 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 28 Jun 2011 09:04:55 +0000 (17:04 +0800)

Trivial merge