Merge commit 'origin/testing' into 0.9.x

Conflicts:
	lib/action.php
	lib/adminpanelaction.php

1 files changed, 2 insertions, 0 deletions

diff --git a/lib/right.php b/lib/right.php
index 4e9c5a918..deb451fde 100644
--- a/lib/right.php
+++ b/lib/right.php
@@ -58,5 +58,7 @@ class Right
     const EMAILONSUBSCRIBE   = 'emailonsubscribe';
     const EMAILONFAVE        = 'emailonfave';
     const MAKEGROUPADMIN     = 'makegroupadmin';
+    const GRANTROLE          = 'grantrole';
+    const REVOKEROLE         = 'revokerole';
 }