]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Sat, 7 Nov 2009 15:56:34 +0000 (04:56 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Sat, 7 Nov 2009 15:56:34 +0000 (04:56 +1300)

Trivial merge