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

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 90d2527ea76bce7a1c08ee1fc58459babf4ab8be,fb6fe61005fe897016e65910d7e086c2541c8f60..e285891f710ad6cb4177261d2cf011ad4e993f73
--- 1/debian/changelog
--- 2/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