Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Thu, 18 Jun 2015 13:03:00 +0000 (14:03 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 18 Jun 2015 13:03:00 +0000 (14:03 +0100)

Trivial merge