From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sat, 27 Sep 2008 18:33:49 +0000 (-0600)
Subject: Merged from trunk.
X-Git-Tag: SQUID_3_1_0_1~45^2~11^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43f13027a2186c202832bc32aa38a7704f5002ca;p=thirdparty%2Fsquid.git

Merged from trunk.
---

43f13027a2186c202832bc32aa38a7704f5002ca
diff --cc src/Makefile.am
index 9131f2aca0,d16a8c4f37..1b20279161
mode 100755,100644..100644
--- a/src/Makefile.am
+++ b/src/Makefile.am