Merge branch 'MDL-44948' of git://github.com/timhunt/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 8 Apr 2014 03:13:43 +0000 (11:13 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 8 Apr 2014 03:13:43 +0000 (11:13 +0800)
commit593fc9d8d674078c066343ba10acf4c966d612bb
tree49ea73878af6f21013183f3b73d4fa2d9bfe9ca8
parentaaba0d56e2c0831737112abafb5dfcb36afd7250
parent3a528d4e7608a15f4d02157bf4b6ebf4fa3fff60
Merge branch 'MDL-44948' of git://github.com/timhunt/moodle
lib/classes/plugin_manager.php
lib/db/upgrade.php