Merge branch 'MDL-28023_assignment_jabber' of git://github.com/andyjdavis/moodle