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

Trivial merge