Merge branch 'wip-MDL-53292-master' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 00:46:38 +0000 (08:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 00:46:38 +0000 (08:46 +0800)
commitda871bb4c1dbd6cb8d3dc2b47d7435f408ee563d
tree17016b55965fb46e54d77ec87caf22aef194b2ba
parent795150c550f94fc940c4486e889565fd69748732
parent8fef061da48fbb4c361bea6b49ab938ef241cda1
Merge branch 'wip-MDL-53292-master' of https://github.com/marinaglancy/moodle
lib/moodlelib.php