refs/heads/1.8.x-rm-external-dir - subversion - Git at Google

commit: 2f8a4bb848df3686e70eac9696d68b9b7007caf1
[log]
author: Bert Huijben <rhuijben@apache.org>
Thu Jun 05 12:28:24 2014 +0000
committer: Bert Huijben <rhuijben@apache.org>
Thu Jun 05 12:28:24 2014 +0000
tree: f38de57d3c9f5950a2abb6e234f2f0ad55625bc0
parent: 4f225feaecee40b63ee27894eb0c4b0c18d6cd7b [diff]

Merge r1600311,1600315,1600323,1600393 from trunk, resolving a trivial text conflict

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-rm-external-dir@1600633 13f79535-47bb-0310-9956-ffa450edef68

2 files changed

tree: f38de57d3c9f5950a2abb6e234f2f0ad55625bc0