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)
commite32d5f9b88374fa2622bdfcb29f8786136b6b34d
tree36d6333f3facdcf9fdcc48a9ca86a537fa10bda3
parent476b123a721c2cec1b022ca23f63b239d45c473c
parent0b661c7d52baae531140aa2cba09294382643dde
Merge branch 'w06_MDL-26256_20_collator' of git://github.com/skodak/moodle