]> git.ipfire.org Git - thirdparty/squid.git/commit
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Sat, 2 Oct 2010 15:40:25 +0000 (04:40 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Sat, 2 Oct 2010 15:40:25 +0000 (04:40 +1300)
commitd8ea93e37ad4449f71c3a1237f879b858a83510d
tree02704a433cbeb2bf390b54d3080d75ae773c09c4
parent642a305c2b7cce1a68f778ef7db9f5948489d3b6
parenta098f9565ce1d3a34d82644669656a75aa0ee2f1
Merge from trunk
23 files changed:
doc/release-notes/release-3.2.sgml
src/Makefile.am
src/adaptation/icap/ModXact.cc
src/cache_cf.cc
src/cf.data.pre
src/client_side.cc
src/client_side_reply.cc
src/client_side_request.cc
src/comm.cc
src/errorpage.cc
src/ftp.cc
src/helper.cc
src/http.cc
src/http.h
src/icp_v2.cc
src/main.cc
src/neighbors.cc
src/protos.h
src/stat.cc
src/store.cc
src/structs.h
src/tools.cc
src/typedefs.h