Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Fri, 23 Oct 2015 12:47:49 +0000 (13:47 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 23 Oct 2015 12:47:49 +0000 (13:47 +0100)

Trivial merge