Merge branch '0.9.x' into adminpanel

Conflicts:
	classes/User.php

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/router.php b/lib/router.php
index b143cd537..9629267ac 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -96,7 +96,10 @@ class Router
                           'unsubscribe', 'confirmaddress', 'recoverpassword',
                           'invite', 'favor', 'disfavor', 'sup',
                           'block', 'unblock', 'subedit',
-                          'groupblock', 'groupunblock');
+                          'groupblock', 'groupunblock',
+                          'sandbox', 'unsandbox',
+                          'silence', 'unsilence',
+                          'deleteuser');
 
             foreach ($main as $a) {
                 $m->connect('main/'.$a, array('action' => $a));