commit | 123bd315af45a54f95fc3fe9e10d8c50d44dca40 | [log] [tgz] |
---|---|---|
author | Stefan Fuhrmann <stefan2@apache.org> | Mon Jan 18 09:04:23 2016 +0000 |
committer | Stefan Fuhrmann <stefan2@apache.org> | Mon Jan 18 09:04:23 2016 +0000 |
tree | 7e9c8b8bb426c3e35732381aef0db152e7d0d342 | |
parent | 227d00c52804c3095af74763558945231d5ad3cf [diff] |
On the 1.8.x-portability branch: Merge r1722879 from /trunk and resolve the trivial text conflict. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-portability@1725195 13f79535-47bb-0310-9956-ffa450edef68