Merge branch 'MDL-26520' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 6 Mar 2011 23:29:14 +0000 (00:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 6 Mar 2011 23:29:14 +0000 (00:29 +0100)

Trivial merge