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)
commitd6211dce9a4bb5aa1c8148cf19b6c949ba9fe4ba
tree8335fa93e0d0db30781f6820c72179e222e130d7
parentec58c9ddf01e03b1dc9f61d820324b3cdfaa10c3
parent6c0f13a5bcb94de5d921a64c25e1c8c7b43aef79
Merge branch 'MDL-25816_jabber_preference' of git://github.com/andyjdavis/moodle