| commit | 2ece8c429dfb0a61f417ec85f166640d934e200c | [log] [tgz] |
|---|---|---|
| author | Eric Norman <enorman@apache.org> | Wed Feb 24 04:44:43 2010 +0000 |
| committer | Eric Norman <enorman@apache.org> | Wed Feb 24 04:44:43 2010 +0000 |
| tree | 8e42f51980f595b2ae82707cfdf855dce42ca284 | |
| parent | 0069cec83c755b7fa77344c898a9d160590211fa [diff] |
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