Merge branch 'MDL-25816_jabber_preference' of git://github.com/andyjdavis/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Feb 2011 15:51:49 +0000 (16:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Feb 2011 15:51:49 +0000 (16:51 +0100)

Trivial merge