Sam Hemelryk bfb6e97eae Merge branch 'MDL-43784-master' of git://github.com/FMCorz/moodle
Conflicts:
	lib/classes/plugin_manager.php
	lib/db/upgrade.php
2014-03-26 11:33:47 +13:00
..
2014-03-14 13:40:11 +08:00
2014-03-20 17:30:42 +08:00
2014-03-14 13:38:37 +08:00
2014-02-26 14:39:03 +08:00
2014-03-14 13:38:37 +08:00
2014-03-14 13:40:11 +08:00