Merge branch 'MDL-40264-essay-zero' of git://github.com/ktemkin/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jun 2013 19:24:00 +0000 (21:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jun 2013 19:24:00 +0000 (21:24 +0200)

Trivial merge