Merge branch 'MDL-52608-master' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jan 2016 06:47:52 +0000 (14:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jan 2016 06:47:52 +0000 (14:47 +0800)
1  2 
lib/moodlelib.php

Simple merge