Merge branch 'install_master' of git://github.com/amosbot/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 19 May 2012 10:17:09 +0000 (12:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 19 May 2012 10:17:09 +0000 (12:17 +0200)

Trivial merge