| commit | ed4a15cbba93b1e202e8f7a41bf60d38b4e217cb | [log] [tgz] |
|---|---|---|
| author | Stefan Sperling <stsp@apache.org> | Tue Mar 27 15:06:17 2012 +0000 |
| committer | Stefan Sperling <stsp@apache.org> | Tue Mar 27 15:06:17 2012 +0000 |
| tree | efe92f051029d918c874fe2537d1f35f1d40ba4f | |
| parent | ac5fb083348f6fd86bc3eb39a45a5e5079484b41 [diff] |
On the 1.7.x-issue4144 branch, merge r1302588 and r1305853 from trunk, resolving conflicts. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4144@1305863 13f79535-47bb-0310-9956-ffa450edef68