Merge branch 'install_master' of git://git.moodle.org/moodle-install
authorSam Hemelryk <sam@moodle.com>
Fri, 13 Dec 2013 03:59:08 +0000 (16:59 +1300)
committerSam Hemelryk <sam@moodle.com>
Fri, 13 Dec 2013 03:59:08 +0000 (16:59 +1300)

Trivial merge