| commit | 9f50ddb05efd786f4276a1221c0e9b17c54c6bd8 | [log] [tgz] |
|---|---|---|
| author | Bert Huijben <rhuijben@apache.org> | Tue Dec 17 15:52:55 2013 +0000 |
| committer | Bert Huijben <rhuijben@apache.org> | Tue Dec 17 15:52:55 2013 +0000 |
| tree | dfb6229475e7924a07652bdb93b7b33e3c6f425d | |
| parent | 2ec7cf1af93e11d50774941ee847e6568ed28727 [diff] |
Merge r1551579 from trunk, removing testcase changes and fixing text conflict git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1551579@1551590 13f79535-47bb-0310-9956-ffa450edef68