]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk rev.13534
authorAmos Jeffries <squid3@treenet.co.nz>
Tue, 19 Aug 2014 09:38:19 +0000 (02:38 -0700)
committerAmos Jeffries <squid3@treenet.co.nz>
Tue, 19 Aug 2014 09:38:19 +0000 (02:38 -0700)

Trivial merge