Merge branch 'install_master' of git://github.com/amosbot/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Nov 2011 18:48:26 +0000 (19:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Nov 2011 18:48:26 +0000 (19:48 +0100)

Trivial merge