Merge branch 'MDL-53978-master-fix' of https://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Mar 2017 01:46:06 +0000 (02:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Mar 2017 01:46:06 +0000 (02:46 +0100)
1  2 
lib/moodlelib.php

Simple merge