Merge branch 'install_master' of git://git.moodle.org/moodle-install
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Mar 2014 21:16:48 +0000 (22:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Mar 2014 21:16:48 +0000 (22:16 +0100)

Trivial merge