Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDavid Monllao <davidm@moodle.com>
Tue, 10 May 2016 10:55:48 +0000 (18:55 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 May 2016 10:55:48 +0000 (18:55 +0800)

Trivial merge