Merge branch 'install_master' of git://github.com/amosbot/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 4 May 2012 11:06:42 +0000 (13:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 4 May 2012 11:06:42 +0000 (13:06 +0200)

Trivial merge