Merge commit 'alioth/master' into debian-master

Conflicts:
	templates/config.tmpl

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

diff --cc templates/config.tmpl
index 68531a8f0e78df089c29910c6a7222799c03d764,77e6db13984fe4f7fbb116c57f29f702b771e852..b1ae79994e8439ffb317b88196622bc74ef84af7
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -5,7 -5,8 +5,8 @@@
  
     organisation = 'Debian'
     project_homepage = 'http://www.debian.org/'
-    packages_homepage = 'http://packages.debian.org/'
+    packages_homepage = '/'
 -   packages_homepage_abs = 'http://packages.debian.net/'
++   packages_homepage_abs = 'http://packages.debian.org/'
     searchformurl = packages_homepage
     search_url = '/search'
     tags_url = 'http://debtags.alioth.debian.org/'
@@@ -48,10 -49,16 +49,12 @@@
        mail => 'webmaster@debian.org',
     }
     trademarknotes = g('%s is a <a href="%s">trademark</a> of %s', organisation, trademark.url, trademark.name)
-    sponsor = {
+    sponsors = [
+    {
 -      url => 'http://example.invalid/',
 -      name => 'Example Sponsor, Inc.',
 -   },
 -   {
 -      url => 'http://example2.invalid/',
 -      name => 'Example2 Sponsor, Inc.',
 -   },
 +      url => 'http://1und1.de/',
 +      name => '1&1 Internet AG',
 +   }
+    ]
  -%]
  [%-
     # possible values for importance: high, normal, low