Merge branch 'install_master' of git://github.com/amosbot/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 29 Mar 2012 11:19:59 +0000 (13:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 29 Mar 2012 11:19:59 +0000 (13:19 +0200)

Trivial merge