]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Thu, 13 May 2010 06:48:36 +0000 (18:48 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Thu, 13 May 2010 06:48:36 +0000 (18:48 +1200)

Trivial merge