Merge branch 'master' of ssh://db.debian.org/git/debian.org

* 'master' of ssh://db.debian.org/git/debian.org:
  Added libintl-perl to debian.org-www-master.debian.org

Conflicts:
	debian/changelog

diff --cc debian/changelog
index c14e3b5f6a3b230086df2f49fa28c46ff9985358,863a0f2ba11f1349ade3a629c2efc8cc8e43e06b..8f79b6a6651ba9a01b8bd35ebc79411537cdd9c0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -37,7 -39,7 +37,10 @@@ debian.org (42) unstable; urgency=lo
    [ Stephen Gran ]
    * Add wheezy chroots to upgrade-porter-chroots
  
 - -- Peter Palfrader <weasel@debian.org>  Wed, 16 Feb 2011 10:21:15 +0100
++  [ Francesca Ciceri ]
++  * debian.org-www-master.debian.org:
++    - add libintl-perl
 + -- Peter Palfrader <weasel@debian.org>  Sat, 19 Mar 2011 23:29:43 +0100
  
  debian.org (41.1) stable; urgency=low
  

diff --cc debian/control
Simple merge