Merge branch 'MDL-53012-master' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 10:44:57 +0000 (10:44 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 10:44:57 +0000 (10:44 +0000)
commit33fa0e1181a17e61519d2d6cf979151c1ec15a67
tree4a5b856bb58a2b320357f6f2f43ce3a0d89558c6
parentf1550594529708c9a1ef65951de7a2daf4916c1a
parenta4ce565f20785e6e51c8d5dede7ecf688ca977b5
Merge branch 'MDL-53012-master' of https://github.com/sammarshallou/moodle
lib/moodlelib.php