Merge branch 'MDL-46232-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Jul 2015 07:53:59 +0000 (15:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Jul 2015 07:53:59 +0000 (15:53 +0800)
commit0c8699c8a9f093eb57b8ac10662dd59ae3718a1c
treecb8af1004c354eaa92ff73d6be2cb476fc3cc0ab
parent6a51993e9f02ff6670e53e35227e7c54fb7a21ad
parenta180d06cb85905444a295a7843512844ef382beb
Merge branch 'MDL-46232-master' of git://github.com/FMCorz/moodle
lib/moodlelib.php