]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Fri, 25 Sep 2009 11:23:25 +0000 (23:23 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Fri, 25 Sep 2009 11:23:25 +0000 (23:23 +1200)

Trivial merge