Merge branch 'install_master' of git://github.com/amosbot/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Jun 2012 08:29:12 +0000 (10:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Jun 2012 08:29:12 +0000 (10:29 +0200)

Trivial merge