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

Simple merge
Simple merge