Merge branch 'MDL-55739-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Oct 2016 16:58:27 +0000 (17:58 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Oct 2016 16:58:27 +0000 (17:58 +0100)
1  2 
course/externallib.php
course/tests/externallib_test.php

Simple merge
Simple merge