From: Eloy Lafuente (stronk7) Date: Tue, 22 Feb 2011 15:51:49 +0000 (+0100) Subject: Merge branch 'MDL-25816_jabber_preference' of git://github.com/andyjdavis/moodle X-Git-Tag: v2.0.3~255 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=d6211dce9a4bb5aa1c8148cf19b6c949ba9fe4ba Merge branch 'MDL-25816_jabber_preference' of git://github.com/andyjdavis/moodle --- d6211dce9a4bb5aa1c8148cf19b6c949ba9fe4ba