Merge branch 'master' into remotefork

diff --combined www/.htaccess
index efb03a92a24bea5c3cea05b9477c0f632c51f51d,1f03facd28af0b2222a9e94c7a6c46dd8fafe203..03bbf60fc5d26d5231538b3d36355584643c9f37
--- 1/www/.htaccess
--- 2/www/.htaccess
+++ b/www/.htaccess
@@@ -13,7 -13,6 +13,7 @@@ RewriteRule ^([0-9]+)/rev/(.+)$ /revisi
  RewriteRule ^([0-9]+)/rev-raw/(.+)/(.+)$ /raw.php?id=$1&rev=$2&file=$3
  RewriteRule ^([0-9]+)/tool/([^/]+)/(.+)$ /tool.php?id=$1&tool=$2&file=$3
  
 +RewriteRule ^fork-remote$ /fork-remote.php
  RewriteRule ^new$ /new.php
  
  RewriteRule ^list$ /list.php
@@@ -21,3 -20,6 +21,6 @@@ RewriteRule ^list/([0-9]+)$ /list.php?p
  
  RewriteRule ^search$ /search.php
  RewriteRule ^search/([0-9]+)$ /search.php?page=$1
+ 
+ RewriteRule ^login$ /login.php
+ RewriteRule ^user$ /user.php