Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Thu, 3 Sep 2015 11:31:47 +0000 (12:31 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 3 Sep 2015 11:31:47 +0000 (12:31 +0100)

Trivial merge