Merge branch 'wip-MDL-45104-master-v2' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Feb 2016 11:06:05 +0000 (11:06 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Feb 2016 11:06:05 +0000 (11:06 +0000)
1  2 
lang/en/moodle.php

Simple merge