Merge pull request #2998 from ahupowerdns/various

author bert hubert <bert.hubert@netherlabs.nl>

Sat, 5 Dec 2015 12:38:29 +0000 (13:38 +0100)

committer bert hubert <bert.hubert@netherlabs.nl>

Sat, 5 Dec 2015 12:38:29 +0000 (13:38 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Sat, 5 Dec 2015 12:38:29 +0000 (13:38 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Sat, 5 Dec 2015 12:38:29 +0000 (13:38 +0100)
diff --cc pdns/Makefile.am
Simple merge
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Sat, 5 Dec 2015 12:38:29 +0000 (13:38 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Sat, 5 Dec 2015 12:38:29 +0000 (13:38 +0100)
		1	2
pdns/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history