From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 21 Jan 2009 08:13:42 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1190^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7108c3175a43fad0c5dc6a986dd8547ddc7745f;p=thirdparty%2Fsquid.git

Merge from trunk
---

d7108c3175a43fad0c5dc6a986dd8547ddc7745f
diff --cc libsquid-compat/GnuRegex.h
index 9bfb36d2cd,65443fefbf..286e4ff6fb
--- a/libsquid-compat/GnuRegex.h
+++ b/libsquid-compat/GnuRegex.h
@@@ -1,7 -1,6 +1,10 @@@
+ /*
+  * $Id$
+  */
 +#ifndef SQUID_CONFIG_H
 +#include "config.h"
 +#endif
 +
  #ifndef SQUID_REGEXP_LIBRARY_H
  #define SQUID_REGEXP_LIBRARY_H