Merge branch 'MDL-54785-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Jun 2016 00:59:49 +0000 (08:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Jun 2016 00:59:49 +0000 (08:59 +0800)
1  2 
lib/moodlelib.php

Simple merge