Merge branch 'wip-mdl-40079' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 3 Dec 2013 20:49:29 +0000 (09:49 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 3 Dec 2013 20:49:29 +0000 (09:49 +1300)
1  2 
admin/settings/plugins.php

Simple merge