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)
1  2 
lib/moodlelib.php

Simple merge