Merge branch 'install_master' of git://github.com/amosbot/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 12 Jan 2012 10:24:39 +0000 (11:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 12 Jan 2012 10:24:39 +0000 (11:24 +0100)

Trivial merge