From owner-cvs-all  Thu Sep 17 15:40:35 1998
Return-Path: <owner-cvs-all>
Received: (from daemon@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id PAA23659
          for cvs-all-outgoing; Thu, 17 Sep 1998 15:40:35 -0700 (PDT)
          (envelope-from owner-cvs-all)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id PAA23587;
          Thu, 17 Sep 1998 15:40:19 -0700 (PDT)
          (envelope-from steve@FreeBSD.org)
From: Steve Price <steve@FreeBSD.ORG>
Received: (from steve@localhost)
	by freefall.freebsd.org (8.8.8/8.8.5) id PAA29030;
	Thu, 17 Sep 1998 15:39:58 -0700 (PDT)
Date: Thu, 17 Sep 1998 15:39:58 -0700 (PDT)
Message-Id: <199809172239.PAA29030@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG
Subject: cvs commit: CVSROOT modules
Sender: owner-cvs-all@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

steve       1998/09/17 15:39:58 PDT

  Modified files:
    .                    modules 
  Log:
  mergemaster -> ports/sysutils/mergemaster
  
  Revision  Changes    Path
  1.2379    +2 -1      CVSROOT/modules