Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Aug 2017 12:14:15 +0000 (14:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Aug 2017 12:14:15 +0000 (14:14 +0200)

Trivial merge