]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
projects / thirdparty / squid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c24f7fb 3c320e6)
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Sun, 5 Jan 2014 02:09:53 +0000 (18:09 -0800)
committerAmos Jeffries <squid3@treenet.co.nz>
Sun, 5 Jan 2014 02:09:53 +0000 (18:09 -0800)

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