Merge branch 'MDL-48499' of https://github.com/danielneis/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Mar 2015 21:00:07 +0000 (22:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Mar 2015 21:00:07 +0000 (22:00 +0100)
1  2 
lang/en/moodle.php

Simple merge