Merge branch 'MDL-50915_m31v5' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jan 2016 02:18:31 +0000 (10:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jan 2016 02:18:31 +0000 (10:18 +0800)
1  2 
mod/lesson/lib.php

Simple merge