Merge branch 'MDL-55284-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jul 2016 14:53:41 +0000 (15:53 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Jul 2016 14:53:41 +0000 (15:53 +0100)
1  2 
mod/assign/externallib.php
mod/assign/tests/externallib_test.php

Simple merge
Simple merge