]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
merge from trunk
authorChristos Tsantilas <chtsanti@users.sourceforge.net>
Wed, 2 Feb 2011 17:55:24 +0000 (19:55 +0200)
committerChristos Tsantilas <chtsanti@users.sourceforge.net>
Wed, 2 Feb 2011 17:55:24 +0000 (19:55 +0200)

Trivial merge