Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Thu, 24 Apr 2014 09:57:13 +0000 (17:57 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 24 Apr 2014 09:57:13 +0000 (17:57 +0800)

Trivial merge