]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Sat, 3 Oct 2015 05:36:14 +0000 (22:36 -0700)
committerAmos Jeffries <squid3@treenet.co.nz>
Sat, 3 Oct 2015 05:36:14 +0000 (22:36 -0700)

Trivial merge