Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Nov 2015 18:00:41 +0000 (19:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Nov 2015 18:00:41 +0000 (19:00 +0100)

Trivial merge