]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Mon, 14 Sep 2009 02:33:31 +0000 (14:33 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Mon, 14 Sep 2009 02:33:31 +0000 (14:33 +1200)

Trivial merge