Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Thu, 7 Jan 2016 08:32:30 +0000 (08:32 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 7 Jan 2016 08:32:30 +0000 (08:32 +0000)

Trivial merge