Merge branch 'MDL-57392-master' of git://github.com/jleyva/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 9 Jan 2017 12:40:14 +0000 (13:40 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 9 Jan 2017 12:40:14 +0000 (13:40 +0100)
1  2 
course/externallib.php
course/tests/externallib_test.php

Simple merge
Simple merge