Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Fri, 30 Oct 2015 21:09:20 +0000 (21:09 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 30 Oct 2015 21:09:20 +0000 (21:09 +0000)

Trivial merge