Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Thu, 18 Feb 2016 09:14:09 +0000 (09:14 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 18 Feb 2016 09:14:09 +0000 (09:14 +0000)

Trivial merge