Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDavid Monllao <davidm@moodle.com>
Thu, 25 Jun 2015 05:49:55 +0000 (13:49 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 25 Jun 2015 05:49:55 +0000 (13:49 +0800)

Trivial merge