Merge branch 'install_master' of git://github.com/amosbot/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 27 Apr 2012 10:38:28 +0000 (12:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 27 Apr 2012 10:38:28 +0000 (12:38 +0200)

Trivial merge