Merge branch 'w52_MDL-30948_m23_messagesuspended' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jan 2012 23:47:48 +0000 (00:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jan 2012 23:47:48 +0000 (00:47 +0100)
commit96f888506cc1f65d1004f354895fe4944fd85dd8
treeb45598df1a3295aa8cd1c4bef5bbc4e18d39736b
parent792182713aeeed7b81c8567b6748d2156c5aab3d
parentdaa8b1ac06ad38e0a07d2120a4779ba3afa6f0e7
Merge branch 'w52_MDL-30948_m23_messagesuspended' of git://github.com/skodak/moodle
lib/moodlelib.php
message/output/email/message_output_email.php
message/output/jabber/message_output_jabber.php