Merge branch 'install_master' of git://github.com/amosbot/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 1 Dec 2011 11:04:08 +0000 (12:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 1 Dec 2011 11:04:08 +0000 (12:04 +0100)

Trivial merge