]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk rev.13526
authorAmos Jeffries <squid3@treenet.co.nz>
Tue, 5 Aug 2014 15:24:33 +0000 (08:24 -0700)
committerAmos Jeffries <squid3@treenet.co.nz>
Tue, 5 Aug 2014 15:24:33 +0000 (08:24 -0700)
1  2 
doc/release-notes/release-3.5.sgml
src/Makefile.am
src/SquidConfig.h
src/cf.data.pre

Simple merge
diff --cc src/Makefile.am
Simple merge
Simple merge
diff --cc src/cf.data.pre
Simple merge