Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Fri, 2 Dec 2016 15:19:09 +0000 (15:19 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 2 Dec 2016 15:19:09 +0000 (15:19 +0000)

Trivial merge