Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorJake Dallimore <jake@moodle.com>
Thu, 29 Jun 2017 08:23:41 +0000 (16:23 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 29 Jun 2017 08:23:41 +0000 (16:23 +0800)

Trivial merge