Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Thu, 16 Feb 2017 08:14:28 +0000 (08:14 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Feb 2017 08:14:28 +0000 (08:14 +0000)

Trivial merge