Merge branch 'MDL-27821' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2011 17:41:32 +0000 (19:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2011 17:41:32 +0000 (19:41 +0200)

Trivial merge