Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDavid Monllao <davidm@moodle.com>
Thu, 1 Sep 2016 03:14:01 +0000 (11:14 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 1 Sep 2016 03:14:01 +0000 (11:14 +0800)

Trivial merge