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)
commitd71448e2a6bcd630e05b9ad4c0359ea42ead9b59
tree120674d72b0c866ee13c3d9b25a29a725249a4a4
parent02038b9d79e224ad1fc769722a58088e747e298a
parent61f7b10b9a45100e60474d38c46fa0b6c0fafd42
Merge branch 'wip-MDL-45104-master-v2' of git://github.com/abgreeve/moodle
lang/en/moodle.php