From owner-svn-src-stable-9@FreeBSD.ORG  Mon Apr  2 10:24:51 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4C29D106566B;
	Mon,  2 Apr 2012 10:24:51 +0000 (UTC)
	(envelope-from ivoras@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 375DC8FC08;
	Mon,  2 Apr 2012 10:24:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q32AOpUU092190;
	Mon, 2 Apr 2012 10:24:51 GMT (envelope-from ivoras@svn.freebsd.org)
Received: (from ivoras@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q32AOppg092188;
	Mon, 2 Apr 2012 10:24:51 GMT (envelope-from ivoras@svn.freebsd.org)
Message-Id: <201204021024.q32AOppg092188@svn.freebsd.org>
From: Ivan Voras <ivoras@FreeBSD.org>
Date: Mon, 2 Apr 2012 10:24:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233772 - stable/9/etc
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2012 10:24:51 -0000

Author: ivoras
Date: Mon Apr  2 10:24:50 2012
New Revision: 233772
URL: http://svn.freebsd.org/changeset/base/233772

Log:
  Merge r233506: MySQL port 3306 in /etc/services

Modified:
  stable/9/etc/services
Directory Properties:
  stable/9/etc/   (props changed)

Modified: stable/9/etc/services
==============================================================================
--- stable/9/etc/services	Mon Apr  2 07:51:30 2012	(r233771)
+++ stable/9/etc/services	Mon Apr  2 10:24:50 2012	(r233772)
@@ -2219,6 +2219,8 @@ iscsi-target	3260/tcp   # iSCSI port
 iscsi-target	3260/udp   # iSCSI port
 ccmail		3264/tcp   #cc:mail/lotus
 ccmail		3264/udp   #cc:mail/lotus
+mysql		3306/tcp   #MySQL
+mysql		3306/udp   #MySQL
 dec-notes	3333/tcp   #DEC Notes
 dec-notes	3333/udp   #DEC Notes
 rdp		3389/tcp   #Microsoft Remote Desktop Protocol