Merge branch 'install_master' of git://github.com/amosbot/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Nov 2011 09:54:40 +0000 (10:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Nov 2011 09:54:40 +0000 (10:54 +0100)

Trivial merge