Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Tue, 14 Apr 2015 15:49:02 +0000 (16:49 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Apr 2015 15:49:02 +0000 (16:49 +0100)

Trivial merge