tree 160635f9d66cb074c0c39b276597efb8707cbd9e
parent 007afa42eb3a6769e9c39a1c9f5f5bd029cd38e1
parent f70e5db249114682c12ab49f32dd902049b044d5
author Greg Stein <gstein@apache.org> 1373515568 +0000
committer Greg Stein <gstein@apache.org> 1373515568 +0000

On the 1.8.x-busted-proxy branch:

Perform a catchup-merge from the 1.8.x branch. (ensured clean merge,
and reduces overall diff)


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-busted-proxy@1502106 13f79535-47bb-0310-9956-ffa450edef68