| commit | 1a1a130cb355c24bd4565d5b14f3f4fd66f158e0 | [log] [tgz] |
|---|---|---|
| author | Philip Martin <philip@apache.org> | Tue Mar 18 13:42:53 2014 +0000 |
| committer | Philip Martin <philip@apache.org> | Tue Mar 18 13:42:53 2014 +0000 |
| tree | 20f7b1e89ebfb41e04b424dffe94e8bfda7d9ace | |
| parent | 0764dd8044adc83460eeb6ce6214747030f01d7a [diff] |
On 1.8.x-r1578853 branch, merge r1578853 and r1578875 and resolve text conflict. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1578853@1578885 13f79535-47bb-0310-9956-ffa450edef68