Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDavid Monllao <davidm@moodle.com>
Thu, 14 Jul 2016 09:28:37 +0000 (11:28 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 14 Jul 2016 09:28:37 +0000 (11:28 +0200)

Trivial merge