Merge branch 'MDL-52226-master' of git://github.com/sammarshallou/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 06:41:21 +0000 (14:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 06:41:21 +0000 (14:41 +0800)
commitf08d1590c814857f263209ccad9211a15f60b7ae
tree948bab2d74dacefb5d45f1d34c47225aae8f5dba
parent3adcec2b702054b251b6d20d0aca59cf9830af2b
parent6d4858d5b3e4bfced82e1d63ae4062a61fb8028e
Merge branch 'MDL-52226-master' of git://github.com/sammarshallou/moodle
lib/setuplib.php