Merge branch 'master' into archive-master

diff --cc templates/config.tmpl
index 70f14a8ddb95341a2196f346eb24356349fe134f,98525ebc247c768350cbe924871bc599a8fc23f7..719dcf98405b29b504a1576e15a2a75809e3db6c
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -43,10 -43,14 +43,14 @@@
          url => project_homepage _ 'contact',
     }
     admin = {
 -      name => g('%s Webmaster', organisation),
 -      mail => 'webmaster@debian.org',
 +      name => 'Frank Lichtenheld',
 +      mail => 'djpig@debian.org',
     }
     trademarknotes = g('%s is a <a href="%s">trademark</a> of %s', organisation, trademark.url, trademark.name)
+ #   sponsor = {
+ #     url => 'http://example.invalid/',
+ #     name => 'Example Sponsor, Inc.',
+ #   }
  -%]
  [%-
     # possible values for importance: high, normal, low