Merge branch 'MDL-57657-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Mar 2017 07:24:54 +0000 (07:24 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Mar 2017 07:24:54 +0000 (07:24 +0000)
1  2 
mod/lesson/lib.php

Simple merge