Merge branch 'MDL-55137-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Jul 2016 13:37:56 +0000 (14:37 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Jul 2016 13:37:56 +0000 (14:37 +0100)
1  2 
lib/externallib.php

Simple merge