Merge branch 'MDL-25122' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Feb 2011 11:41:28 +0000 (12:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Feb 2011 11:41:28 +0000 (12:41 +0100)

Trivial merge