Merge branch 'MDL-48012_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 01:41:09 +0000 (09:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 01:41:09 +0000 (09:41 +0800)
commitc111ef97180a5b3b651215295ef3a9ebaa5be4b4
tree95d654c718604e7666aba03c3411b66969cf3d33
parentd3c65e8c607ea7e327c5cb3fae36e3d93a46d680
parent93af6a610e6f139895144f3ccab4dfe9d78a69fc
Merge branch 'MDL-48012_master' of git://github.com/markn86/moodle
course/lib.php
lib/moodlelib.php