Merge branch 'install_master' of git://github.com/amosbot/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jun 2011 00:30:37 +0000 (02:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jun 2011 00:30:37 +0000 (02:30 +0200)

Trivial merge