Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Fri, 10 Oct 2014 11:09:14 +0000 (12:09 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 10 Oct 2014 11:09:14 +0000 (12:09 +0100)

Trivial merge