Merge branch 'MDL-49244-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 18:16:44 +0000 (20:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 18:16:44 +0000 (20:16 +0200)
1  2 
course/externallib.php
course/tests/externallib_test.php

Simple merge
Simple merge