| commit | a8c01935fe0fc6d8271a266e31af6e5799086f5f | [log] [tgz] |
|---|---|---|
| author | Stefan Fuhrmann <stefan2@apache.org> | Thu Apr 30 05:08:36 2015 +0000 |
| committer | Stefan Fuhrmann <stefan2@apache.org> | Thu Apr 30 05:08:36 2015 +0000 |
| tree | 10b2f51f5c2c0896757374b783a23c0d34956721 | |
| parent | b6269037890ce705ca364a2f45249ef0d3330d9e [diff] |
Merged r1676667 from /trunk and resolved a tree conflict. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1676667@1676899 13f79535-47bb-0310-9956-ffa450edef68