From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Tue, 5 Aug 2008 21:10:15 +0000 (-0300)
Subject: Merge branch 'master' into archive-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;ds=sidebyside;h=ba6fa55e176be2e079c8a46a8c6fdd5e06184e21;p=deb%2Fpackages.git

Merge branch 'master' into archive-master
---

ba6fa55e176be2e079c8a46a8c6fdd5e06184e21
diff --cc templates/config.tmpl
index 70f14a8,98525eb..719dcf9
--- a/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