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

Trivial merge