Merge branch 'install_master' of git://git.moodle.org/moodle-install
authorSam Hemelryk <sam@moodle.com>
Fri, 4 Oct 2013 02:43:52 +0000 (15:43 +1300)
committerSam Hemelryk <sam@moodle.com>
Fri, 4 Oct 2013 02:43:52 +0000 (15:43 +1300)

Trivial merge