Merge branch '0.8.x' into groupblock

Conflicts:
	lib/router.php

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/router.php b/lib/router.php
index 469d9a171..3d870e565 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -101,7 +101,7 @@ class Router
         $main = array('login', 'logout', 'register', 'subscribe',
                       'unsubscribe', 'confirmaddress', 'recoverpassword',
                       'invite', 'favor', 'disfavor', 'sup',
-                      'block', 'subedit', 'groupblock');
+                      'block', 'unblock', 'subedit', 'groupblock');
 
         foreach ($main as $a) {
             $m->connect('main/'.$a, array('action' => $a));