]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merged from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Sat, 10 Nov 2012 10:37:56 +0000 (23:37 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Sat, 10 Nov 2012 10:37:56 +0000 (23:37 +1300)

Trivial merge