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

Trivial merge