]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
projects / thirdparty / squid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8f86fd 3bc5ed5)
Merge from trunk rev.13875
authorAmos Jeffries <squid3@treenet.co.nz>
Fri, 23 Jan 2015 11:31:08 +0000 (03:31 -0800)
committerAmos Jeffries <squid3@treenet.co.nz>
Fri, 23 Jan 2015 11:31:08 +0000 (03:31 -0800)

Trivial merge
Mirror of https://github.com/squid-cache/squid.git