Merge branch 'install_master' of git://git.moodle.org/moodle-install
authorSam Hemelryk <sam@moodle.com>
Thu, 8 Aug 2013 04:19:12 +0000 (16:19 +1200)
committerSam Hemelryk <sam@moodle.com>
Thu, 8 Aug 2013 04:19:12 +0000 (16:19 +1200)

Trivial merge