Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1492608 - in /subversion/branches/1.8.x: ./ CHANGES
Date: Thu, 13 Jun 2013 10:10:42 -0000
To: commits@subversion.apache.org
From: breser@apache.org
Message-Id: <20130613101043.12EE823889EB@eris.apache.org>

Author: breser
Date: Thu Jun 13 10:10:42 2013
New Revision: 1492608

URL: http://svn.apache.org/r1492608
Log:
Merge r1491499 from trunk to 1.8.x branch.

Technically this is touching the 1.8.0 CHANGES entry, but didn't make it in the
1.8.0 release packages because it would have required reverting a change that
got merged into the 1.8.x that shouldn't have been.  I didn't figure that work
was necessary for removing a dupliciate CHANGES entry.

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/CHANGES   (contents, props changed)

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1491499

Modified: subversion/branches/1.8.x/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/CHANGES?rev=1492608&r1=1492607&r2=1492608&view=diff
==============================================================================
--- subversion/branches/1.8.x/CHANGES (original)
+++ subversion/branches/1.8.x/CHANGES Thu Jun 13 10:10:42 2013
@@ -99,7 +99,6 @@ http://svn.apache.org/repos/asf/subversi
     * support ipv6 in URLs (e.g. http://[::1]/svn/repos) (r1454047)
     * conflict resolver now iterates paths in a sorted order (r1461820)
     * mod_dav_svn does keyword expansion with 'kw=1' query arg (r1466055)
-    * add support for custom keyword definitions (issue #890)
 
   - Minor new features and improvements (server-side):
     * improve performance of config file parsing (r1344347 et al)

Propchange: subversion/branches/1.8.x/CHANGES
------------------------------------------------------------------------------
  Merged /subversion/trunk/CHANGES:r1491499