Merge branch 'install_master' of git://github.com/amosbot/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 May 2012 17:31:03 +0000 (19:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 May 2012 17:31:03 +0000 (19:31 +0200)

Trivial merge