Merge branch 'MDL-53870-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 23:45:02 +0000 (01:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 23:45:02 +0000 (01:45 +0200)
1  2 
lib/classes/plugin_manager.php

Simple merge