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

Trivial merge