tree d602a56f512f04390bf40a13a110e5fb3929a535
parent 7fd65b3ef885f0277d5ca05971c5a6c566dec61e
author Karl Fogel <kfogel@apache.org> 1200986448 +0000
committer Karl Fogel <kfogel@apache.org> 1200986448 +0000

Bring reintegrate branch up to date with trunk.

   $ svn merge -r28946:28976 https://svn.collab.net/repos/svn/trunk .


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/reintegrate@869051 13f79535-47bb-0310-9956-ffa450edef68