Merge branch 'install_master' of git://github.com/amosbot/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Nov 2011 19:07:36 +0000 (20:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Nov 2011 19:07:36 +0000 (20:07 +0100)

Trivial merge