Merge branch 'install_master' of git://github.com/amosbot/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 1 Jun 2012 09:01:41 +0000 (17:01 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 1 Jun 2012 09:01:41 +0000 (17:01 +0800)

Trivial merge