Merge branch 'mdl-26299' of git://github.com/mackensen/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 17:23:56 +0000 (18:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 17:23:56 +0000 (18:23 +0100)

Trivial merge