Merge branch 'install_master' of git://git.moodle.org/moodle-install
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Feb 2014 14:29:34 +0000 (15:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Feb 2014 14:29:34 +0000 (15:29 +0100)

Trivial merge