]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Sun, 13 Jul 2014 04:14:23 +0000 (21:14 -0700)
committerAmos Jeffries <squid3@treenet.co.nz>
Sun, 13 Jul 2014 04:14:23 +0000 (21:14 -0700)

Trivial merge