Merge branch 'install_master' of git://github.com/amosbot/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 19 Apr 2012 09:37:38 +0000 (17:37 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 19 Apr 2012 09:37:38 +0000 (17:37 +0800)

Trivial merge