]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk rev.14325
authorAmos Jeffries <squid3@treenet.co.nz>
Sun, 27 Sep 2015 23:40:35 +0000 (16:40 -0700)
committerAmos Jeffries <squid3@treenet.co.nz>
Sun, 27 Sep 2015 23:40:35 +0000 (16:40 -0700)

Trivial merge