From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 13 May 2010 06:20:23 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~167^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd3c67640f571efdb2bf63a7ab637c7c27d8b68a;p=thirdparty%2Fsquid.git

Merge from trunk
---

bd3c67640f571efdb2bf63a7ab637c7c27d8b68a
diff --cc src/errorpage.h
index 9e668c5fa0,c02d8f1ff6..bc68ac7cf4
--- a/src/errorpage.h
+++ b/src/errorpage.h
@@@ -35,9 -35,8 +35,9 @@@
  #define   SQUID_ERRORPAGE_H
  
  #include "squid.h"
 +#include "auth/UserRequest.h"
  #include "cbdata.h"
- #include "ip/IpAddress.h"
+ #include "ip/Address.h"
  
  /**
   \defgroup ErrorPageAPI Error Pages API