]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Sat, 17 Jul 2010 15:44:48 +0000 (03:44 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Sat, 17 Jul 2010 15:44:48 +0000 (03:44 +1200)

Trivial merge