Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Wed, 23 Dec 2015 11:35:46 +0000 (11:35 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Dec 2015 11:35:46 +0000 (11:35 +0000)

Trivial merge