]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Sat, 14 Feb 2009 13:19:07 +0000 (02:19 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Sat, 14 Feb 2009 13:19:07 +0000 (02:19 +1300)
1  2 
configure.in
src/Makefile.am

diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge