Merge branch 'MDL-47476' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 22:02:38 +0000 (11:02 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 22:02:38 +0000 (11:02 +1300)
commit70b370982f82a03ba4c6538e56ce72b40649e643
tree33621d7b03cfc1fb6f5dc88b76f4f3ca9c112581
parent0c1a1760fa4ae453c15be1f6d5c9c8c20c277bd5
parenta75fa4c06876f05dc1feeb4b87795792453b2655
Merge branch 'MDL-47476' of git://github.com/timhunt/moodle

Conflicts:
lib/db/upgrade.php
version.php
lib/classes/plugin_manager.php
lib/db/upgrade.php
version.php