Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 06:36:47 +0000 (14:36 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 06:36:47 +0000 (14:36 +0800)

Trivial merge