Merge branch 'MDL-60377-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 Oct 2017 10:42:11 +0000 (11:42 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 Oct 2017 10:42:11 +0000 (11:42 +0100)
1  2 
course/externallib.php

Simple merge