Merge branch 'master' into debian-master

diff --combined static/about/index.tmpl
index 5d25ca0331997b4a498d31afe68f1ccc8eb0637a,f3e4ec09b6a5f1c1c717014fc9b9ad3b338fa3a5..8802065a03e78bbc7a3eae231d21e4b6d908b950
--- 1/static/about/index.tmpl
--- 2/static/about/index.tmpl
+++ b/static/about/index.tmpl
@@@ -10,17 -10,17 +10,17 @@@
  
  <p>The current code base is maintained by Frank Lichtenheld in
  <a href="http://git.or.cz/">git</a> and can be obtained from
- <a href="http://source.djpig.de/git/">http://source.djpig.de/git/</a>
+ <a href="http://anonscm.debian.org/git/webwml/packages.git">http://anonscm.debian.org/git/webwml/packages.git</a>
  both over <tt>HTTP</tt> and the native git protocol.
  
  <blockquote>
-       git clone http://source.djpig.de/git/packages.git
+       git clone http://anonscm.debian.org/git/webwml/packages.git
  </blockquote>
  
  <p>or
  
  <blockquote>
-       git clone git://source.djpig.de/git/packages.git
+       git clone git://anonscm.debian.org/webwml/packages.git
  </blockquote>
  
  <p>The older second generation code can be found in the Debian CVS
@@@ -93,10 -93,6 +93,10 @@@ Copyright (C) 2006 Jeroen van Wolffelaa
  Copyright (C) 2006, 2007 Frank Lichtenheld &lt;frank@lichtenheld.de&gt;
  </pre>
  
 +<h3>Sponsors</h3>
 +
 +<p><a href="sponsors.html">See our separate Sponsors page</a></p>
 +
  [% PROCESS 'html/foot.tmpl'
        langs.size = 0
        footer.doNotDisplayCopyright = 1 %]