Merge branch 'MDL-35530_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Dec 2012 21:07:03 +0000 (10:07 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Dec 2012 21:07:03 +0000 (10:07 +1300)
1  2 
mod/lesson/essay.php

Simple merge