Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Fri, 15 Sep 2017 07:49:21 +0000 (08:49 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 15 Sep 2017 07:49:21 +0000 (08:49 +0100)

Trivial merge