Sam Hemelryk f18f96f767 Merge branch 'wip-MDL-42016-master' of git://github.com/marinaglancy/moodle ...

Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php

2013-10-09 15:58:45 +13:00

..

advanced_testcase.php

…

arraydataset.php

…

autoloader.php

…

basic_testcase.php

…

database_driver_testcase.php

…

event_mock.php

…

event_sink.php

…

hint_resultprinter.php

…

message_sink.php

…

phpmailer_sink.php

…

unittestcase.php

…

util.php

Merge branch 'wip-MDL-42016-master' of git://github.com/marinaglancy/moodle

2013-10-09 15:58:45 +13:00