Merge branch 'MDL-39117' of git://github.com/mr-russ/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 3 Oct 2016 02:13:09 +0000 (10:13 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 3 Oct 2016 02:13:09 +0000 (10:13 +0800)
1  2 
lib/classes/plugin_manager.php

Simple merge