]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk rev.13907
authorAmos Jeffries <squid3@treenet.co.nz>
Wed, 4 Feb 2015 22:11:38 +0000 (14:11 -0800)
committerAmos Jeffries <squid3@treenet.co.nz>
Wed, 4 Feb 2015 22:11:38 +0000 (14:11 -0800)

Trivial merge