From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Mon, 2 Jul 2012 15:31:32 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: sourceformat-review-1~164^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92d137fed4ae44f02623c855c6eaa02d3881fb18;p=thirdparty%2Fsquid.git

Merged from trunk
---

92d137fed4ae44f02623c855c6eaa02d3881fb18