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)
1  2 
lang/en/moodle.php

Simple merge