Merge branch 'MDL-26685' of git://github.com/timhunt/moodle
commit7d754148c41c49635f3d755457adddb192c03baa
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Mar 2011 00:06:51 +0000 (7 01:06 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Mar 2011 00:06:51 +0000 (7 01:06 +0100)
tree259eca423c945e417e1232ff4bdd26d778e22bd9
parent2875c1507ffc33fddf16761652e79b0215a3b1d4
parent4a6f461830bf1d671a7a90c64b010aba280ac599
Merge branch 'MDL-26685' of git://github.com/timhunt/moodle