Merge branch 'MDL-59273-master' of https://github.com/lucisgit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Oct 2017 20:38:13 +0000 (22:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Oct 2017 20:38:13 +0000 (22:38 +0200)
1  2 
lib/moodlelib.php

Simple merge