Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Tue, 9 May 2017 11:42:19 +0000 (12:42 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 9 May 2017 11:42:19 +0000 (12:42 +0100)

Trivial merge