Merge branch 'MDL-26567' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Sep 2011 22:10:30 +0000 (00:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Sep 2011 22:10:30 +0000 (00:10 +0200)

Trivial merge