Merge branch 'wip-MDL-60926-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 5 Dec 2017 06:03:45 +0000 (19:03 +1300)
committerJun Pataleta <jun@moodle.com>
Wed, 6 Dec 2017 06:53:35 +0000 (19:53 +1300)
1  2 
lib/moodlelib.php

Simple merge