Merge branch 'MDL-26976-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 Jun 2017 13:55:55 +0000 (14:55 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Jun 2017 13:55:55 +0000 (14:55 +0100)
commit214962f964e2a1b1a55ca06bc732d711549fc698
tree396d46bfb490b5f6d8d48c0ad1bdb48404957ffe
parent6252f44d845d929764a56423047636e1c6e0af2e
parentb5ef326c03a3252f4b47184042e4acdf947ebd0f
Merge branch 'MDL-26976-master' of git://github.com/jleyva/moodle
lang/en/moodle.php