Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Fri, 28 Nov 2014 08:04:36 +0000 (08:04 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 28 Nov 2014 08:04:36 +0000 (08:04 +0000)

Trivial merge