Merge branch 'MDL-29873' of git://github.com/jmvedrine/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 30 Oct 2014 06:17:32 +0000 (14:17 +0800)
committerMarina Glancy <marina@moodle.com>
Thu, 30 Oct 2014 06:17:32 +0000 (14:17 +0800)
1  2 
mod/lesson/essay.php

Simple merge