refs/heads/1.6.x-r1230212 - subversion

commit: dca22ed4a5cbd0520c9145622b3debd46e360035
[log]
author: Philip Martin <philip@apache.org>
Tue Feb 07 09:23:22 2012 +0000
committer: Philip Martin <philip@apache.org>
Tue Feb 07 09:23:22 2012 +0000
tree: 842e3d2c2beb8ed41944f70a8fd86d47f8df00f0
parent: 8ff6ca0e9e95bd647232ffd08db2f227a79a8008 [diff]

Merge r1230212 to 1.6.x-r1230212 and resolve conflicts.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1230212@1241388 13f79535-47bb-0310-9956-ffa450edef68

subversion/libsvn_fs_fs/fs_fs.c[diff]

1 file changed

tree: 842e3d2c2beb8ed41944f70a8fd86d47f8df00f0