Merge branch 'MDL-54801-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 17:54:53 +0000 (19:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 17:54:53 +0000 (19:54 +0200)
1  2 
course/externallib.php
course/tests/externallib_test.php

Simple merge
Simple merge