Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Thu, 31 Dec 2015 08:16:31 +0000 (08:16 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 31 Dec 2015 08:16:31 +0000 (08:16 +0000)

Trivial merge