Merge branch 'MDL-48965' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 Mar 2015 21:05:56 +0000 (21:05 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Mar 2015 21:05:56 +0000 (21:05 +0000)
1  2 
mod/lesson/pagetypes/shortanswer.php

Simple merge