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)
commit5c6d2b1480556d79a4aff3a7ae70a9eff6f59a72
treed1ea68661b89dba6cd8c982c59107e7bc9e68517
parent8f3020558d5fb8ece0ccc942dbdc6b8903cd055b
parent22fae2a0dd343045812ecbf8ddfccabd1e59c762
Merge branch 'wip-MDL-36369-master' of git://github.com/marinaglancy/moodle
admin/settings/plugins.php