CVSROOT: /cvs Module name: src Changes by: [email protected] 2014/03/14 10:03:54
Modified files:
usr.sbin/nsd : configure configure.ac nsd-checkconf.8.in
nsd.8.in nsd.conf.5.in server.c xfrd.c
Log message:
merge conflicts
