Merge branch 'MDL-27868' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 17 Jun 2011 14:45:30 +0000 (16:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 17 Jun 2011 14:45:30 +0000 (16:45 +0200)

Trivial merge