Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Fri, 4 Mar 2016 02:34:18 +0000 (10:34 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 4 Mar 2016 02:34:18 +0000 (10:34 +0800)

Trivial merge