Merge branch 'MDL-29548' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2011 10:31:34 +0000 (12:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2011 10:31:34 +0000 (12:31 +0200)

Trivial merge