tree 8e42f51980f595b2ae82707cfdf855dce42ca284
parent 0069cec83c755b7fa77344c898a9d160590211fa
author Eric Norman <enorman@apache.org> 1266986683 +0000
committer Eric Norman <enorman@apache.org> 1266986683 +0000

SLING-997 handle merges involving aggregate privileges properly

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@915670 13f79535-47bb-0310-9956-ffa450edef68