CVS: cvs.openbsd.org: src

[Brad Smith]

CVSROOT:        /cvs
Module name:    src
Changes by:     b...@cvs.openbsd.org    2014/12/11 09:26:58

Modified files:
        usr.sbin/unbound: Makefile.in configure configure.ac 
        usr.sbin/unbound/daemon: remote.c 
        usr.sbin/unbound/doc: Changelog unbound-host.1.in unbound.8.in 
        usr.sbin/unbound/util/data: msgreply.c 

Log message:
merge conflicts