Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Thu, 31 Mar 2016 06:06:25 +0000 (14:06 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 31 Mar 2016 06:06:25 +0000 (14:06 +0800)

Trivial merge