Merge branch 'install_master' of git://github.com/amosbot/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 24 Jun 2012 16:27:53 +0000 (18:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 24 Jun 2012 16:27:53 +0000 (18:27 +0200)

Trivial merge