From: bert hubert <bert.hubert@netherlabs.nl>
Date: Mon, 26 Oct 2015 07:51:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'main/master' into luaqa
X-Git-Tag: dnsdist-1.0.0-alpha1~262^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13fa75b587d820a70e94b759935995baa51bd334;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'main/master' into luaqa

Conflicts:
	pdns/Makefile.am
---

13fa75b587d820a70e94b759935995baa51bd334
diff --cc pdns/Makefile.am
index 75c2bfc13f,7cf651454a..9828c4e8ac
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@@ -109,7 -110,7 +110,8 @@@ EXTRA_PROGRAMS = 
  	dnstcpbench \
  	dnswasher \
  	dumresp \
 +	kvresp \
+ 	ixplore \
  	notify \
  	nproxy \
  	nsec3dig \