Merge branch 'MDL-29627' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2011 09:22:15 +0000 (11:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2011 09:22:15 +0000 (11:22 +0200)

Trivial merge