Merge branch 'MDL-58071-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Feb 2017 21:57:09 +0000 (22:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Feb 2017 21:57:09 +0000 (22:57 +0100)
1  2 
lib/moodlelib.php

Simple merge