Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorJake Dallimore <jake@moodle.com>
Fri, 13 Jul 2018 04:26:05 +0000 (12:26 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 13 Jul 2018 04:26:05 +0000 (12:26 +0800)

Trivial merge