Merged from trunk rev.14084

author Amos Jeffries <squid3@treenet.co.nz>

Fri, 22 May 2015 09:59:09 +0000 (02:59 -0700)

committer Amos Jeffries <squid3@treenet.co.nz>

Fri, 22 May 2015 09:59:09 +0000 (02:59 -0700)
author Amos Jeffries <squid3@treenet.co.nz>
Fri, 22 May 2015 09:59:09 +0000 (02:59 -0700)
committer Amos Jeffries <squid3@treenet.co.nz>
Fri, 22 May 2015 09:59:09 +0000 (02:59 -0700)
diff --cc CREDITS
Simple merge
diff --cc configure.ac
Simple merge
diff --cc src/dns_internal.cc
Simple merge
diff --cc src/event.cc
Simple merge
diff --cc src/main.cc
Simple merge
author	Amos Jeffries <squid3@treenet.co.nz>
	Fri, 22 May 2015 09:59:09 +0000 (02:59 -0700)
committer	Amos Jeffries <squid3@treenet.co.nz>
	Fri, 22 May 2015 09:59:09 +0000 (02:59 -0700)
		1	2
CREDITS	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/dns_internal.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/event.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.cc	patch \|	diff1 \|	diff2 \|	blob \| history