Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDavid Monllao <davidm@moodle.com>
Thu, 1 Feb 2018 13:26:33 +0000 (14:26 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 1 Feb 2018 13:26:33 +0000 (14:26 +0100)

Trivial merge