Merge pull request #3357 from rgacogne/dnsdist-non-terminal-rules

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

Sun, 14 Feb 2016 15:41:57 +0000 (16:41 +0100)

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

Sun, 14 Feb 2016 15:41:57 +0000 (16:41 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Sun, 14 Feb 2016 15:41:57 +0000 (16:41 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Sun, 14 Feb 2016 15:41:57 +0000 (16:41 +0100)
diff --cc pdns/README-dnsdist.md
Simple merge
diff --cc pdns/dnsrulactions.hh
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Sun, 14 Feb 2016 15:41:57 +0000 (16:41 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Sun, 14 Feb 2016 15:41:57 +0000 (16:41 +0100)
		1	2
pdns/README-dnsdist.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsrulactions.hh	patch \|	diff1 \|	diff2 \|	blob \| history