Merge branch 'MDL-48438' of https://github.com/andrewhancox/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Oct 2015 23:12:17 +0000 (01:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Oct 2015 23:12:17 +0000 (01:12 +0200)
1  2 
lang/en/moodle.php

Simple merge