]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Tue, 12 Jan 2010 23:31:55 +0000 (12:31 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Tue, 12 Jan 2010 23:31:55 +0000 (12:31 +1300)

Trivial merge