refs/heads/cache-server - subversion

commit: 82e47a03f0298e6c0e6a24311ac572d9ce9b88f8
[log] [tgz]
author: Stefan Fuhrmann <stefan2@apache.org>
Tue Oct 15 08:52:06 2013 +0000
committer: Stefan Fuhrmann <stefan2@apache.org>
Tue Oct 15 08:52:06 2013 +0000
tree: 6f0cdfcd4d64d9e6107e5ec8c08df53ef0b0dcfe
parent: 8ccb1577064b4a6cd648cf9bcc44aa51424d7c15 [diff]
parent: 753052b0413c0b35c25be25b88e6b41c5fd5c961 [diff]

On the cache-server branch: sync with /trunk up to r1532246.
Resolved a text conflict on cache-membuffer.c

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

tree: 6f0cdfcd4d64d9e6107e5ec8c08df53ef0b0dcfe