Merge branch 'MDL-54755_master' of https://github.com/StudiUM/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Jun 2016 01:46:42 +0000 (09:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 29 Jun 2016 07:05:17 +0000 (15:05 +0800)
1  2 
lib/moodlelib.php

Simple merge