Merge branch 'wip-MDL-51354_master' of https://github.com/cdsmith-umn/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 09:33:23 +0000 (10:33 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 09:33:23 +0000 (10:33 +0100)
1  2 
lang/en/moodle.php

Simple merge