Damyon Wiese 370058d8fb Merge branch 'MDL-41838-master' of git://github.com/sammarshallou/moodle ...

Conflicts:
	lib/upgrade.txt

2013-10-10 10:49:11 +08:00

..

tests

Merge branch 'MDL-41838-master' of git://github.com/sammarshallou/moodle

2013-10-10 10:49:11 +08:00

file_archive.php

…

file_exceptions.php

…

file_packer.php

…

file_progress.php

…

file_storage.php

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

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

mbz_packer.php

…

stored_file.php

Merge branch 'MDL-41838-master' of git://github.com/sammarshallou/moodle

2013-10-10 10:49:11 +08:00

tgz_extractor.php

…

tgz_packer.php

…

zip_archive.php

…

zip_packer.php

…