Merge branch 'MDL-50142_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Oct 2015 11:19:13 +0000 (12:19 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Oct 2015 11:19:13 +0000 (12:19 +0100)
commit4a06e4090895200dd8afd3491c72c5c1fb7fe85a
treec7989c52c24ff4459604723171eab684fbfffed5
parent69783d15da908362c36d327e3349bb9142e78344
parent4d37d462cad4501938b2d665fcb0286137aff4ff
Merge branch 'MDL-50142_master' of https://github.com/dmonllao/moodle
lang/en/moodle.php