Merge branch 'install_master' of git://github.com/amosbot/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 22 Mar 2012 23:11:57 +0000 (12:11 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 22 Mar 2012 23:11:57 +0000 (12:11 +1300)

Trivial merge