refs/heads/fsx-id - subversion

commit: 34effe973f208e045e3a29d254e24a23df983c5a
[log]
author: Stefan Fuhrmann <stefan2@apache.org>
Sun Dec 28 12:18:43 2014 +0000
committer: Stefan Fuhrmann <stefan2@apache.org>
Sun Dec 28 12:18:43 2014 +0000
tree: eca39173f54a53e1a073067770f5177e41abe564
parent: 9f70ee71b8b45e629f74928282767483f0b473d2 [diff]
parent: 2f9faec27a55bc5eef26153e4b99896e09b3d536 [diff]

On the fsx-id branch: Sync with /trunk and resolve a minor text conflict in
subversion/libsvn_fs_x/dag.c.

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

tree: eca39173f54a53e1a073067770f5177e41abe564