| commit | c17cecab8f983ba9a3446171547da870b38c5e3e | [log] [tgz] |
|---|---|---|
| author | Paul Burba <pburba@apache.org> | Tue Aug 23 16:54:34 2011 +0000 |
| committer | Paul Burba <pburba@apache.org> | Tue Aug 23 16:54:34 2011 +0000 |
| tree | 923ef68b334b6ce18573803e474db7fb750300b1 | |
| parent | f0542cdefb759898863030c665d22d848c7555c7 [diff] |
On the 1.7.x-issue3975 branch: Merge r1160756 from ^/subversion/trunk. r1160756 was the reintegration of the issue-3975 branch back to trunk. Resolved some minor conflicts on merge_tests.py. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue3975@1160799 13f79535-47bb-0310-9956-ffa450edef68