Merge branch 'MDL-27910' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 19 Jun 2011 23:26:03 +0000 (01:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 19 Jun 2011 23:26:03 +0000 (01:26 +0200)

Trivial merge