]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Sat, 3 Oct 2009 09:48:06 +0000 (22:48 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Sat, 3 Oct 2009 09:48:06 +0000 (22:48 +1300)
1  2 
configure.in
doc/release-notes/release-3.2.sgml

diff --cc configure.in
Simple merge
Simple merge