Merge branch 'MDL-54855-master' of git://github.com/crazyserver/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Jun 2016 14:33:11 +0000 (16:33 +0200)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Jun 2016 08:24:57 +0000 (09:24 +0100)
1  2 
mod/assign/externallib.php

Simple merge