CVS: cvs.openbsd.org: src

[Stuart Henderson]

CVSROOT:        /cvs
Module name:    src
Changes by:     st...@cvs.openbsd.org   2012/08/28 09:15:02

Modified files:
        usr.sbin/nsd   : axfr.c configure configure.ac 
                         nsd-checkconf.8.in nsd-notify.8.in 
                         nsd-patch.8.in nsd-xfer.8.in nsd.8.in 
                         nsd.conf.5.in nsdc.8.in query.c server.c 
                         zonec.8.in 

Log message:
resolve conflicts