From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 24 Nov 2013 07:38:17 +0000 (+0100)
Subject: Merge branch 'kibi'
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=commitdiff_plain;h=f7aeb82b5cd23774930fca75e57bf5ba4971ba4a

Merge branch 'kibi'

* kibi:
  d-i.debian.org: Adjust package list.

Conflicts:
	debian/changelog
---

f7aeb82b5cd23774930fca75e57bf5ba4971ba4a
diff --cc debian/changelog
index 2fb83f5,a4154eb..0221241
--- a/debian/changelog
+++ b/debian/changelog
@@@ -16,13 -16,18 +16,25 @@@ debian.org (53) UNRELEASED; urgency=lo
    * d/control: add postgresql-client to qa.debian.org
      - Apply patch from Bart Martens
  
 +  [ Enrico Zini ]
 +  * nm.d.o update:
 +    + python-lzma
 +
 +  [ Raphaël Hertzog ]
 +  * Add initial meta-package for tracker.debian.org.
 +
+   [ Cyril Brulebois ]
+   * d-i.debian.org:
+     + libfile-slurp-perl
+     + mr
+     + gettext
+     + poxml
+     + xsltproc
+     + docbook-xml
+     + docbook-xsl
+     + graphviz
+     + edos-distcheck
+ 
   -- Bernhard R. Link <brlink@debian.org>  Sun, 13 Oct 2013 11:55:19 +0200
  
  debian.org (52) unstable; urgency=low