Merge branch 'master' of http://kosh.ganneff.de/~joerg/debian.org

[dsa-metapackages.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index e686fe05afc968e6da49118fd8396beeb5ac54df..e6b12c9a9c1f7f577c3e8f7a892ef105d30e7ddd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debian.org (XX) XXable; urgency=low
+
+  [ Joerg Jaspert]
+  * Update the planet.debian.org metapackage, adding timeout,
+    debianutils, python-django, python as dependencies.
+  * Add an ftpmaster metapackage
+
+ -- Joerg Jaspert <joerg@debian.org>  Sat, 27 Feb 2010 11:54:20 +0100
+
 debian.org (32) stable; urgency=low
 
   * Fix install target of Makefile to deal with usr/bin.