Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDavid Monllao <davidm@moodle.com>
Thu, 4 Feb 2016 06:30:00 +0000 (14:30 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 4 Feb 2016 06:30:00 +0000 (14:30 +0800)

Trivial merge