Merge branch 'equella' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 00:22:26 +0000 (02:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 00:22:26 +0000 (02:22 +0200)

Trivial merge