chiark / gitweb /
Merge branch 'master' of git://anonscm.debian.org/mirror/debian.org
authorEnrico Zini <enrico@enricozini.org>
Thu, 29 Aug 2013 09:34:55 +0000 (11:34 +0200)
committerEnrico Zini <enrico@enricozini.org>
Thu, 29 Aug 2013 09:34:55 +0000 (11:34 +0200)
Conflicts:
debian/changelog

1  2 
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