| commit | 6b1f19fa9e4e171139c3604eeaf6dd5e37e36bcf | [log] [tgz] |
|---|---|---|
| author | Paul Burba <pburba@apache.org> | Tue Mar 16 16:26:57 2010 +0000 |
| committer | Paul Burba <pburba@apache.org> | Tue Mar 16 16:26:57 2010 +0000 |
| tree | af02ae9277e70536d69c0b4f9e090dbc684d62a5 | |
| parent | 123f6bc320a57b34ff88c4fb02ffd1409f95143d [diff] |
On the 1.6.x-r892050 branch, merge r892050 from trunk, resolving a minor conflict in merge_tests.py. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r892050@923843 13f79535-47bb-0310-9956-ffa450edef68