Merge branch 'master' into debian-master

Leave out 50961b4eb963cdd14a4362fa8bab7335d5f504ca
(Remove all code related to the mail forwarding from the master branch)

diff --cc conf/apache.conf.sed.in
index 7327825ce8558c05fc2df7aacc078a7a0e64a9ee,8594aecc7c41d1429c629055fada41c060631b89..00b38ad6b4b6772a09357b8198771ab45a07cc1e
--- 1/conf/apache.conf.sed.in
--- 2/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -115,15 -110,15 +112,15 @@@
     RewriteRule ^/favicon.ico$ - [L]
     RewriteRule ^/robots.txt$ - [L]
  
 -#   RewriteRule ^/$ http://www.debian.org/distrib/packages
 -   RewriteRule ^/$                    /index.html [L]
 +   RewriteRule ^/$ http://www.debian.org/distrib/packages
 +#   RewriteRule ^/$ /index.html [L]
     RewriteRule ^/([^/+]*)([+])([^/]*)$        "/$1%%{%}2B$3" [N]
-    RewriteRule ^/changelog:(.+)$      http://%SITE%/changelogs/${changelog-url:$1} [R,L,NE]
-    RewriteRule ^/src:([^/]+)$         http://%SITE%/search?searchon=sourcenames&keywords=$1 [R,L,NE]
-    RewriteRule ^/file:(.+)$           http://%SITE%/search?searchon=contents&keywords=$1 [R,L,NE]
+    RewriteRule ^/changelog:(.+)$      /changelogs/${changelog-url:$1} [R,L,NE]
+    RewriteRule ^/src:([^/]+)$         /search?searchon=sourcenames&keywords=$1 [R,L,NE]
+    RewriteRule ^/file:(.+)$           /search?searchon=contents&keywords=$1 [R,L,NE]
     RewriteCond %{REQUEST_URI} !^/search$ [OR]
     RewriteCond %{QUERY_STRING} ^$
-    RewriteRule ^/([^/]+)$             http://%SITE%/search?keywords=$1 [R,L,NE]
+    RewriteRule ^/([^/]+)$             /search?keywords=$1 [R,L,NE]
  
     RewriteCond %{QUERY_STRING} =""
     RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]

diff --cc config.sh.sed.in
Simple merge

diff --cc templates/config.tmpl
Simple merge