Merge branch 'wip-MDL-36369-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 06:34:37 +0000 (14:34 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 06:34:37 +0000 (14:34 +0800)
1  2 
admin/settings/plugins.php

Simple merge