Merge branch 'MDL-43784-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 25 Mar 2014 22:33:15 +0000 (11:33 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 25 Mar 2014 22:33:47 +0000 (11:33 +1300)
commitbfb6e97eaeb590ed3ad211742486123963e30e25
tree4f4f6bb96adbed540ab5245add02fb1571e6bcd5
parentdcb43ad7ff73afc032621262dd8e74fcba3031b6
parent7a2dabcbaac440713d98d8843aa455f79be73c8f
Merge branch 'MDL-43784-master' of git://github.com/FMCorz/moodle

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