From: Gerfried Fuchs <rhonda@debian.org>
Date: Fri, 26 Aug 2011 09:02:50 +0000 (+0200)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=e46ca864f95817099aab4d1251c8773e7b51b10f;p=deb%2Fpackages.git

Merge branch 'master' into ubuntu-master
---

e46ca864f95817099aab4d1251c8773e7b51b10f
diff --cc static/about/index.tmpl
index e81a856,f3e4ec0..06fac16
--- a/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>.