git.ipfire.org Git - thirdparty/squid.git/commit

]> git.ipfire.org Git - thirdparty/squid.git/commit

projects / thirdparty / squid.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6df4eca 3196afc)

author	Alex Rousskov <rousskov@measurement-factory.com>
	Tue, 19 Jun 2012 16:08:52 +0000 (10:08 -0600)
committer	Alex Rousskov <rousskov@measurement-factory.com>
	Tue, 19 Jun 2012 16:08:52 +0000 (10:08 -0600)
commit	37276dbb34a2a5bedddf25af3f093228ff43742d
tree	f90f475e7ec29fa70fae2513fe36a41252d8f487	tree \| snapshot
parent	6df4ecaeef5494b2e325c3ecc7483ac98f158bbc	commit \| diff
parent	3196afc2da4668c347dc97822651e2f6488c3202	commit \| diff

Merged from trunk (r12181, v3.2.0.17+)

src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/Server.cc	diff1 \|	diff2 \|	blob \| history
src/adaptation/icap/ModXact.cc	diff1 \|	diff2 \|	blob \| history
src/cache_cf.cc	diff1 \|	diff2 \|	blob \| history
src/client_side.cc	diff1 \|	diff2 \|	blob \| history
src/errorpage.cc	diff1 \|	diff2 \|	blob \| history
src/forward.cc	diff1 \|	diff2 \|	blob \| history
src/ssl/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/url.cc	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/squid-cache/squid.git