Author: stefan2 Revision: 1476675 Modified property: svn:log Modified: svn:log at Sat Apr 27 21:35:35 2013 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Sat Apr 27 21:35:35 2013 @@ -1,3 +1,3 @@ -On the cache-server branch: +On the fsfs-format7 branch: catch up merge with /trunk up to and including r1476664 Resolved some minor conflicts.
