----------------------------------------------------------------------------
r31065 | hwright | 2008-05-07 14:59:49 EDT
Changed paths:
	M /branches/1.5.x/subversion/include/svn_ra.h

Merge r31018 from trunk:

 * r31018
   Fix svn_ra_open3() doc string to say "@since 1.5" not "@since 1.6".
   Notes: This falls into hacking.html's no-vote-necessary category.
     Since I'm nominating it anyway, I'll record my vote, but I'm
     just filing it directly in the Approved section.
   Votes:
     +1: kfogel, danielsh

----------------------------------------------------------------------------
r31071 | hwright | 2008-05-07 15:44:08 EDT
Changed paths:
	M /branches/1.5.x/subversion/include/svn_error_codes.h

Merge r31025 from trunk:

 * r31025
   Fix the SVN_ERR_AUTHN_CREDS_NOT_SAVED message.
   Votes:
     +1: arfrever, danielsh, hwright

----------------------------------------------------------------------------
r31073 | hwright | 2008-05-07 15:48:12 EDT
Changed paths:
	M /branches/1.5.x/subversion/include/svn_io.h

Merge r31031 from trunk:

 * r31031
   Match svn_io_check_path's docstring to its implementation.
   Votes:
     +1: danielsh, arfrever, hwright

----------------------------------------------------------------------------
r31074 | hwright | 2008-05-07 15:50:04 EDT
Changed paths:
	M /branches/1.5.x/subversion/libsvn_fs_base/fs.c

Merge r31049 from trunk:

 * r31049
   s/lock-nodes/lock-tokens/ in a message.
   Votes:
     +1: arfrever, danielsh, hwright

----------------------------------------------------------------------------
r31150 | hwright | 2008-05-13 00:54:47 EDT
Changed paths:
	M /branches/1.5.x/subversion/libsvn_ra_serf/log.c

Merge r31125 from trunk:

  * r31125
    Fix circular dependency between libsvn_ra and libsvn_ra_serf by teaching
    libsvn_ra_serf to call svn_ra_serf__has_capability directly.
    Justification:
      Trivial fix. Necessary for cygwin build.
    Votes:
      +1: djames, lgo, danielsh

----------------------------------------------------------------------------
r31325 | hwright | 2008-05-21 00:28:36 EDT
Changed paths:
	M /branches/1.5.x/subversion/tests/cmdline/copy_tests.py

Merge r31317 from trunk:

 * r31317
   Fix a test so that it doesn't break tests that are run after it.
   Notes:
     Unless you go out of your way to run tests in the suite out of
     order (and we don't have a --random-order), this doesn't actually
     hurt until we try to backport another test to this file, so not a
     1.5.0 release blocker.
   Votes:
     +1: glasser, lgo