Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 8 Nov 2014 22:30:53 +0000 (23:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 8 Nov 2014 22:30:53 +0000 (23:30 +0100)

Trivial merge