Merge branch 'MDL-59624-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 31 Jul 2017 14:54:32 +0000 (15:54 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 31 Jul 2017 14:54:32 +0000 (15:54 +0100)
1  2 
mod/data/classes/external.php
mod/data/tests/externallib_test.php

Simple merge
Simple merge