]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Sun, 12 Oct 2008 12:29:37 +0000 (01:29 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Sun, 12 Oct 2008 12:29:37 +0000 (01:29 +1300)
1  2 
src/cf.data.pre
src/errorpage.h

diff --cc src/cf.data.pre
Simple merge
diff --cc src/errorpage.h
Simple merge