Merge branch 'MDL-26060' of git://github.com/grabs/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Feb 2011 10:30:33 +0000 (11:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Feb 2011 10:30:33 +0000 (11:30 +0100)

Trivial merge