Merge branch 'install_master' of git://github.com/amosbot/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 17 Feb 2012 00:43:19 +0000 (01:43 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 17 Feb 2012 00:43:19 +0000 (01:43 +0100)

Trivial merge