Merge branch 'install_master' of git://github.com/amosbot/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Aug 2011 00:38:24 +0000 (02:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Aug 2011 00:38:24 +0000 (02:38 +0200)

Trivial merge