]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Sat, 21 Nov 2009 05:06:46 +0000 (18:06 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Sat, 21 Nov 2009 05:06:46 +0000 (18:06 +1300)

Trivial merge