Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Tue, 28 Oct 2014 12:32:48 +0000 (12:32 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Oct 2014 12:32:48 +0000 (12:32 +0000)

Trivial merge