Merge branch 'master' into ubuntu-master

diff --cc static/about/index.tmpl
index e81a856bedde7fc7a41eae795e871d6558c14ba2,f3e4ec09b6a5f1c1c717014fc9b9ad3b338fa3a5..06fac169835461af6ba35adcaa86e8edc3c2061c
--- 1/static/about/index.tmpl
--- 2/static/about/index.tmpl
+++ b/static/about/index.tmpl
@@@ -20,12 -20,9 +20,12 @@@ both over <tt>HTTP</tt> and the native 
  <p>or
  
  <blockquote>
-       git clone git://source.djpig.de/git/packages.git
+       git clone git://anonscm.debian.org/webwml/packages.git
  </blockquote>
  
 +<p>The modifications specific to Ubuntu can be found in the <tt>ubuntu-master</tt>
 +branch.</p>
 +
  <p>The older second generation code can be found in the Debian CVS
  at <a href="http://cvs.debian.org/packages/?cvsroot=webwml">cvs.debian.org</a>.
  

diff --cc templates/html/show.tmpl
Simple merge