]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge form trunk rev.14722
authorAmos Jeffries <squid3@treenet.co.nz>
Sun, 26 Jun 2016 15:30:29 +0000 (03:30 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Sun, 26 Jun 2016 15:30:29 +0000 (03:30 +1200)

Trivial merge