Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDavid Monllao <davidm@moodle.com>
Fri, 13 Nov 2015 07:28:16 +0000 (15:28 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 13 Nov 2015 07:28:16 +0000 (15:28 +0800)

Trivial merge