Merge branch 'MDL-25616_recent_messages' of git://github.com/andyjdavis/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Feb 2011 18:26:21 +0000 (19:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Feb 2011 18:26:21 +0000 (19:26 +0100)
commitc04c06dc8e63814c5dfeff0f415f1c947572a86b
treea0d5f0b72a8154a9de8f45610a9479f2723ba45a
parent07e21f6054566f73bb322935042fefc864087237
parentbcab42daf256a545ba17c531800f20018cbf3553
Merge branch 'MDL-25616_recent_messages' of git://github.com/andyjdavis/moodle

Conflicts fixed:
message/index.php
message/lib.php
message/index.php
message/lib.php