Merge branch 'w06_MDL-26256_20_collator' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Feb 2011 20:41:04 +0000 (21:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Feb 2011 20:41:04 +0000 (21:41 +0100)

Trivial merge