From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 23 Aug 2014 10:39:15 +0000 (-0700)
Subject: Sync with trunk rev.13542
X-Git-Tag: SQUID_3_5_0_1~98^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ac5bd881bf4eda91a239a9db7734be91d360822;p=thirdparty%2Fsquid.git

Sync with trunk rev.13542
---

3ac5bd881bf4eda91a239a9db7734be91d360822
diff --cc CONTRIBUTORS
index 6a8010a53a,63999890a1..6b8eba8b55
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@@ -1,13 -1,17 +1,18 @@@
 -Special thanks go to people who have volunteered their time, effort,
 -and ideas to make this software available.
 +This file contains a list of Squid contributors: people and organizations that
 +have volunteered their time, effort, code, and ideas to make Squid software.
 +Thank you!
  
+     'noloader' <noloader@gmail.com>
      Adam Ciarcinski
      Adrian Chadd <adrian@squid-cache.org>
+     Alan Mizrahi <alan@mizrahi.com.ve>
      Alex Rousskov <rousskov@measurement-factory.com>
      Alexander B. Demenshin <aldem@barnet.kharkov.ua>
+     Alexander Komyagin <komyagin@altell.ru>
      Alexander Lukyanov <lav@yar.ru>
+     Alexandre Chappaz <alexandrechappaz@gmail.com>
      Alexey Veselovsky <alexey.veselovsky@eykontech.com>
+     Alexis Robert <alexis.robert@gmail.com>
      Alin Nastac <mrness@gentoo.org>
      Alter <alter@alter.org.ua>
      Amos Jeffries <amosjeffries@squid-cache.org>
@@@ -185,18 -231,31 +233,32 @@@
      Svenx <svensven@gmail.com>
      Taavi Talvik <taavi@uninet.ee>
      Taketo Kabe <kabe@shiratori.riec.tohoku.ac.jp>
 +    The Measurement Factory <info@measurement-factory.com>
+     Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
+     Thomas Hozza <thozza@redhat.com>
      Thomas Ristic <thr@bootet.net>
+     Thomas Weber <x@4t2.com>
      Thomas-Martin Seck <tmseck@netcologne.de>
+     Tianyin Xu <tixu@cs.ucsd.edu>
      Tim Starling <tstarling@wikimedia.org>
+     Tomas Hozza <thozza@redhat.com>
      Tony Lorimer <tlorimer@au.mdis.com>
      Unknown - NetBSD Project
+     Unknown FreeBSD Contributor
      Vincent Regnard
+     Vitaliy Matytsyn (main) <vm@if.bank.gov.ua>
      Vitaliy Matytsyn <vm@if.bank.gov.ua>
      Wesha <wesha@iname.com>
+     Will Roberts <squid@bigwillystyle42.com>
      Wojtek Sylwestrzak <W.Sylwestrzak@icm.edu.pl>
+     Wolfgang Breyha <wbreyha@gmx.net>
      Wolfgang Nothdurft <wolfgang@linogate.de>
+     Zhanpeng Chen <lowstz@gmail.com>
      benno@jeamland.net
      fancyrabbit <fancyrabbit@gmail.com>
+     folkert <folkert@vanheusden.com>
+     hno
+     kinkie@squid-cache.org
+     libit <sambabug.lb@gmail.com>
+     rousskov
      vollkommen <vollkommen@gmx.net>
-     Benjamin Kerensa <bkerensa@ubuntu.com>
diff --cc src/acl/AclAddress.h
index 73063b4374,7e69f644c1..66ae13805b
--- a/src/acl/AclAddress.h
+++ b/src/acl/AclAddress.h
@@@ -26,11 -29,8 +26,11 @@@
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
   */
  
 +#ifndef ACLADDRESS_H_
 +#define ACLADDRESS_H_
- #include "Acl.h"
- #include "ip/Address.h"
++
  #include "acl/Acl.h"
+ #include "ip/Address.h"
  
  /// list of address-based ACLs. Currently a POD.
  class AclAddress