Merge branch 'install_master' of git://github.com/amosbot/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 13 Jul 2011 12:06:16 +0000 (20:06 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 13 Jul 2011 12:06:16 +0000 (20:06 +0800)

Trivial merge