]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Mon, 22 Jun 2015 04:14:58 +0000 (21:14 -0700)
committerAmos Jeffries <squid3@treenet.co.nz>
Mon, 22 Jun 2015 04:14:58 +0000 (21:14 -0700)

Trivial merge