Merge branch 'install_master' of git://github.com/amosbot/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Oct 2011 22:04:52 +0000 (00:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Oct 2011 22:04:52 +0000 (00:04 +0200)

Trivial merge