From: Enrico Zini <enrico@enricozini.org>
Date: Thu, 29 Aug 2013 09:34:55 +0000 (+0200)
Subject: Merge branch 'master' of git://anonscm.debian.org/mirror/debian.org
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=commitdiff_plain;h=2988281c1d98452c3024ad03c7a1be9f4ecdc1bc

Merge branch 'master' of git://anonscm.debian.org/mirror/debian.org

Conflicts:
	debian/changelog
---

2988281c1d98452c3024ad03c7a1be9f4ecdc1bc
diff --cc debian/changelog
index 90d2527,fb6fe61..e285891
--- a/debian/changelog
+++ b/debian/changelog
@@@ -71,11 -71,9 +71,14 @@@ debian.org (52) UNRELEASED; urgency=lo
    * piuparts-master:
      + add python-yaml
  
 +  [ Enrico Zini ]
 +  * nm.debian.org:
 +    + python-django-south
 +    + postgresql-client
 +
+   [ Simon Paillard ]
+   * debian.org-packages.debian.org: switch from modperl to fastcgi
+ 
   -- Peter Palfrader <weasel@debian.org>  Mon, 15 Apr 2013 13:01:08 +0200
  
  debian.org (51) unstable; urgency=low