Module name: src
Changes by: brad@cvs.openbsd.org 2014/09/16 11:01:38

Modified files:
usr.sbin/nsd : Makefile.in config.h.in configparser.y
configure configure.ac dname.c dns.c lookup3.c
nsd-checkconf.8.in nsd-checkconf.c nsd.8.in
nsd.c nsd.conf.5.in nsec3.c rrl.c server.c
util.c util.h xfrd-disk.c xfrd-tcp.c xfrd.c
zparser.y

Log message:
merge conflicts