From: Brion Vibber <brion@pobox.com>
Date: Tue, 28 Dec 2010 19:37:38 +0000 (-0800)
Subject: Merge branch 'master' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=90c7ff1983a51b0883532be81be1afdd9d02a24c;p=quix0rs-gnu-social.git

Merge branch 'master' into 0.9.x
---

90c7ff1983a51b0883532be81be1afdd9d02a24c
diff --cc lib/right.php
index 5bf9c41161,ccabd00c92..d144b21ae9
--- a/lib/right.php
+++ b/lib/right.php
@@@ -61,9 -61,6 +61,10 @@@ class Righ
      const GRANTROLE          = 'grantrole';
      const REVOKEROLE         = 'revokerole';
      const DELETEGROUP        = 'deletegroup';
 +    const BACKUPACCOUNT      = 'backupaccount';
 +    const RESTOREACCOUNT     = 'restoreaccount';
 +    const DELETEACCOUNT      = 'deleteaccount';
 +    const MOVEACCOUNT        = 'moveaccount';
+     const CREATEGROUP        = 'creategroup';
  }