Merge branch 'MDL-55046-master' of git://github.com/dpalou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 17:40:52 +0000 (19:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 17:40:52 +0000 (19:40 +0200)
1  2 
mod/assign/externallib.php
mod/assign/tests/externallib_test.php

Simple merge
Simple merge