Merge branch 'install_master' of git://github.com/amosbot/moodle
authorSam Hemelryk <sam@moodle.com>
Fri, 29 Jul 2011 02:13:57 +0000 (10:13 +0800)
committerSam Hemelryk <sam@moodle.com>
Fri, 29 Jul 2011 02:13:57 +0000 (10:13 +0800)

Trivial merge