Merge remote branch 'pkern/master'

[dsa-metapackages.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 2efc25d9b2f435b5091072c49cc8341ee3c90b26..caacab3dcbfccfd9fea02bb31acb6782cded8e87 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
 debian.org (4XXXXXX) Xnstable; urgency=low
 
   [ Andreas Barth ]
-  * add python3.1 for release.debian.org
+  * add python3.1, python3.1-dev and python3-apt for release.debian.org
 
- -- Peter Palfrader <weasel@debian.org>  Sat, 30 Jul 2011 11:28:15 +0200
+  [ Tollef Fog Heen ]
+  * Add clasp, picosat for release.debian.org (RT #3324)
+
+  [ Philipp Kern ]
+  * Drop clasp from release.debian.org.
+  * Add openjdk-6-jre-headless to release.debian.org.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Sun, 31 Jul 2011 10:36:22 +0200
 
 debian.org (44) unstable; urgency=low