Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDavid Monllao <davidm@moodle.com>
Tue, 8 May 2018 12:02:38 +0000 (14:02 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 May 2018 12:02:38 +0000 (14:02 +0200)

Trivial merge