]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Wed, 11 Dec 2013 01:32:21 +0000 (17:32 -0800)
committerAmos Jeffries <squid3@treenet.co.nz>
Wed, 11 Dec 2013 01:32:21 +0000 (17:32 -0800)

Trivial merge