Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Nov 2015 09:50:48 +0000 (10:50 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Nov 2015 09:50:48 +0000 (10:50 +0100)

Trivial merge