Merge branch 'w01_MDL-43402_m27_zlib' of https://github.com/skodak/moodle

author Damyon Wiese <damyon@moodle.com>

Tue, 7 Jan 2014 04:29:45 +0000 (12:29 +0800)

committer Damyon Wiese <damyon@moodle.com>

Tue, 7 Jan 2014 04:29:45 +0000 (12:29 +0800)
author Damyon Wiese <damyon@moodle.com>
Tue, 7 Jan 2014 04:29:45 +0000 (12:29 +0800)
committer Damyon Wiese <damyon@moodle.com>
Tue, 7 Jan 2014 04:29:45 +0000 (12:29 +0800)
diff --cc lang/en/admin.php
Simple merge
diff --cc lib/filelib.php
Simple merge
diff --cc lib/setup.php
Simple merge
author	Damyon Wiese <damyon@moodle.com>
	Tue, 7 Jan 2014 04:29:45 +0000 (12:29 +0800)
committer	Damyon Wiese <damyon@moodle.com>
	Tue, 7 Jan 2014 04:29:45 +0000 (12:29 +0800)
		1	2
lang/en/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/filelib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/setup.php	patch \|	diff1 \|	diff2 \|	blob \| history