commit | d156ce3fe5057fc039cc5e89ee551296df1d6265 | [log] [tgz] |
---|---|---|
author | Paul Burba <pburba@apache.org> | Tue Mar 31 16:35:17 2009 +0000 |
committer | Paul Burba <pburba@apache.org> | Tue Mar 31 16:35:17 2009 +0000 |
tree | 2a83e1f5084b0131a9332ac9138d4f854463f4e6 | |
parent | b40373ad5cca6ff7fecbf9453025f0f199c7e3ec [diff] |
On the 1.5.x-r36879 branch: Merge r36879 from trunk, resolving some minor conflicts in merge_tests.py. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-r36879@876978 13f79535-47bb-0310-9956-ffa450edef68