]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Fri, 30 Nov 2012 11:24:03 +0000 (00:24 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Fri, 30 Nov 2012 11:24:03 +0000 (00:24 +1300)

Trivial merge