Merge "Added Range support to FileBackend::streamFile()"

author Brion VIBBER <brion@wikimedia.org>

Tue, 19 Jul 2016 19:20:12 +0000 (19:20 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 19 Jul 2016 19:20:12 +0000 (19:20 +0000)
author Brion VIBBER <brion@wikimedia.org>
Tue, 19 Jul 2016 19:20:12 +0000 (19:20 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 19 Jul 2016 19:20:12 +0000 (19:20 +0000)
diff --cc includes/filerepo/FileRepo.php
Simple merge
diff --cc includes/libs/MultiHttpClient.php
Simple merge
author	Brion VIBBER <brion@wikimedia.org>
	Tue, 19 Jul 2016 19:20:12 +0000 (19:20 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 19 Jul 2016 19:20:12 +0000 (19:20 +0000)
		1	2
includes/filerepo/FileRepo.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/libs/MultiHttpClient.php	patch \|	diff1 \|	diff2 \|	blob \| history