Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Oct 2013 23:41:36 +0000 (12:41 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Oct 2013 23:41:36 +0000 (12:41 +1300)
commit571781fbf6337468aa1ce83cbf4da5af8af6b5f2
tree436c1c31bd9ef0836bcee68ff5ad8efe567b210c
parent8fe9bbde098f07cce9dd37e30bdd28588136bec6
parentcc0bb815ad639415ccb132de39a2f0666208de4c
Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle
admin/settings/plugins.php
lang/en/admin.php