Merge branch 'MDL-42495-m' of git://github.com/micaherne/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 20 Jan 2014 05:21:58 +0000 (13:21 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 20 Jan 2014 05:21:58 +0000 (13:21 +0800)
1  2 
mod/lesson/essay.php

Simple merge