From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 12 Jul 2015 10:07:01 +0000 (-0700)
Subject: Merge from trunk
X-Git-Tag: merge-candidate-3-v1~38^2~18^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7dec7abb2236d4fce5f6ecd571b27ca804596e9;p=thirdparty%2Fsquid.git

Merge from trunk
---

a7dec7abb2236d4fce5f6ecd571b27ca804596e9
diff --cc src/Makefile.am
index 322941399a,a3d0b38912..1f6db6d1c8
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -2151,8 -2130,6 +2129,7 @@@ tests_testEventLoop_SOURCES = 
  	int.cc \
  	internal.h \
  	internal.cc \
 +	LogTags.cc \
- 	tests/stub_libsecurity.cc \
  	SquidList.h \
  	SquidList.cc \
  	MasterXaction.cc \
@@@ -2392,8 -2370,6 +2370,7 @@@ tests_test_http_range_SOURCES = 
  	internal.cc \
  	$(IPC_SOURCE) \
  	ipcache.cc \
 +	LogTags.cc \
- 	tests/stub_libsecurity.cc \
  	SquidList.h \
  	SquidList.cc \
  	MasterXaction.cc \
@@@ -3505,8 -3485,6 +3487,7 @@@ tests_testURL_SOURCES = 
  	int.cc \
  	internal.h \
  	internal.cc \
 +	LogTags.cc \
- 	tests/stub_libsecurity.cc \
  	SquidList.h \
  	SquidList.cc \
  	MasterXaction.cc \