Merge branch 'install_master' of git://git.moodle.org/moodle-install
authorSam Hemelryk <sam@moodle.com>
Tue, 24 Dec 2013 04:17:26 +0000 (17:17 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 24 Dec 2013 04:17:26 +0000 (17:17 +1300)

Trivial merge