From owner-freebsd-commit  Mon Oct 23 05:59:50 1995
Return-Path: owner-commit
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id FAA05907
          for freebsd-commit-outgoing; Mon, 23 Oct 1995 05:59:50 -0700
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id FAA05894
          for cvs-all-outgoing; Mon, 23 Oct 1995 05:59:42 -0700
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id FAA05884
          for cvs-usrsbin-outgoing; Mon, 23 Oct 1995 05:59:36 -0700
Received: (from peter@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id FAA05874
          ; Mon, 23 Oct 1995 05:59:31 -0700
Date: Mon, 23 Oct 1995 05:59:31 -0700
From: Peter Wemm <peter>
Message-Id: <199510231259.FAA05874@freefall.freebsd.org>
To: CVS-commiters, cvs-usrsbin
Subject: cvs commit: src/usr.sbin/nslookup subr.c
Sender: owner-commit@FreeBSD.org
Precedence: bulk

peter       95/10/23 05:59:30

  Modified:    usr.sbin/nslookup  subr.c
  Log:
  merge beta26 import conflicts