]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Tue, 23 Jun 2009 23:29:56 +0000 (11:29 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Tue, 23 Jun 2009 23:29:56 +0000 (11:29 +1200)

Trivial merge