Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Fri, 18 Dec 2015 12:26:46 +0000 (12:26 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Dec 2015 12:26:46 +0000 (12:26 +0000)

Trivial merge