Merge branch 'install_master' of git://github.com/amosbot/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 19 Jul 2012 05:41:50 +0000 (13:41 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 19 Jul 2012 05:41:50 +0000 (13:41 +0800)

Trivial merge