Merge branch 'MDL-51830-master' of git://github.com/lucisgit/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 1 Dec 2015 10:29:27 +0000 (18:29 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 10:11:04 +0000 (11:11 +0100)
1  2 
lang/en/moodle.php

Simple merge