a17e647473d7e825a967e68bb4b13d79374e4632 - subversion

commit: a17e647473d7e825a967e68bb4b13d79374e4632
[log]
author: Bert Huijben <rhuijben@apache.org>
Wed Aug 17 13:11:53 2011 +0000
committer: Bert Huijben <rhuijben@apache.org>
Wed Aug 17 13:11:53 2011 +0000
tree: 41a06f11c0e5974496fb0bd5757f524f169aff35
parent: 247bab2c9830ddfc31a1493c95d2ff9072349f86 [diff]

On the 1.7.x-JavaHL-pools branch: merged r1154115, r1154119, r1154144, r1154155, r1154159, r1154215, r1154225 from trunk, resolving a small conflict caused by r1154144. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-JavaHL-pools@1158688 13f79535-47bb-0310-9956-ffa450edef68