Merge branch 'install_master' of git://github.com/amosbot/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 Jan 2012 12:28:00 +0000 (13:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 Jan 2012 12:28:00 +0000 (13:28 +0100)

Trivial merge