Merge branch 'install_master' of git://github.com/amosbot/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Oct 2011 16:41:14 +0000 (18:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Oct 2011 16:41:14 +0000 (18:41 +0200)

Trivial merge