From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 19 Mar 2011 22:30:42 +0000 (+0100)
Subject: Merge branch 'master' of ssh://db.debian.org/git/debian.org
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=commitdiff_plain;h=12766839686302757c4b26406a6f5a259267effb

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

12766839686302757c4b26406a6f5a259267effb
diff --cc debian/changelog
index c14e3b5,863a0f2..8f79b6a
--- a/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