From 2b006dca15a9bc83a90ee8996428cd20c57484e0 Mon Sep 17 00:00:00 2001
From: Roy Wetherall <roy.wetherall@alfresco.com>
Date: Tue, 25 Jun 2013 00:35:24 +0000
Subject: [PATCH] Merged BRANCHES/V2.0 to HEAD (record only):

  - r50933: Merged DEV/DODRECERT TO BRANCHES/V2.0:
     - r50933: DOD Recert: Allow permissions to be set on the file plan node (so that Dan and Jan can create root categories) (see RM-733 and RM-552)
        - Merge HEAD to DEV/DODCERT
           - r43798 RM-552 (Add 'Manage Permission' action to file plan toolbar)
           - r43859 RM-552 (Add 'Manage Permission' action to file plan toolbar)
                  * Changed the icons
           - r43863 RM-552 (Add 'Manage Permission' action to file plan toolbar)
                  * Changed the existing ManageAccessRights capability and reusing it




git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@51417 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261