From owner-svn-ports-all@FreeBSD.ORG  Mon Mar 18 21:23:39 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 58A14258;
 Mon, 18 Mar 2013 21:23:39 +0000 (UTC) (envelope-from flo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3F91DBFB;
 Mon, 18 Mar 2013 21:23:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2ILNdB2002235;
 Mon, 18 Mar 2013 21:23:39 GMT (envelope-from flo@svn.freebsd.org)
Received: (from flo@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2ILNcgt002230;
 Mon, 18 Mar 2013 21:23:38 GMT (envelope-from flo@svn.freebsd.org)
Message-Id: <201303182123.r2ILNcgt002230@svn.freebsd.org>
From: Florian Smeets <flo@FreeBSD.org>
Date: Mon, 18 Mar 2013 21:23:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314603 - in head/databases: percona56-client
 percona56-server
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Mar 2013 21:23:39 -0000

Author: flo
Date: Mon Mar 18 21:23:38 2013
New Revision: 314603
URL: http://svnweb.freebsd.org/changeset/ports/314603

Log:
  Fix merge mistakes.

Modified:
  head/databases/percona56-client/Makefile
  head/databases/percona56-server/Makefile

Modified: head/databases/percona56-client/Makefile
==============================================================================
--- head/databases/percona56-client/Makefile	Mon Mar 18 21:18:03 2013	(r314602)
+++ head/databases/percona56-client/Makefile	Mon Mar 18 21:23:38 2013	(r314603)
@@ -1,3 +1,4 @@
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	percona

Modified: head/databases/percona56-server/Makefile
==============================================================================
--- head/databases/percona56-server/Makefile	Mon Mar 18 21:18:03 2013	(r314602)
+++ head/databases/percona56-server/Makefile	Mon Mar 18 21:23:38 2013	(r314603)
@@ -1,3 +1,4 @@
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME?=	percona
@@ -8,7 +9,7 @@ MASTER_SITES=	http://www.percona.com/dow
 PKGNAMESUFFIX?=	-server
 DISTNAME=	Percona-Server-5.6.10-alpha60.2
 
-MAINTAINER=	ale@FreeBSD.org
+MAINTAINER=	flo@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/percona56-client