* CHANGES: Merge CHANGES from the trunk as of r13837.
* dist.sh: Changes that should not have been committed (reverted in r13871).


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.1.x@853912 13f79535-47bb-0310-9956-ffa450edef68
2 files changed