Merge branch 'MDL-26332' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 17:26:33 +0000 (18:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 17:26:33 +0000 (18:26 +0100)

Trivial merge