[Python-modules-commits] r9202 - in packages/python-django/trunk/debian (changelog)

[lamby at users.alioth.debian.org]

    Date: Wednesday, July 29, 2009 @ 09:29:53
  Author: lamby
Revision: 9202

Tidy changelog.

Modified:
  packages/python-django/trunk/debian/changelog

Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog	2009-07-29 09:29:47 UTC (rev 9201)
+++ packages/python-django/trunk/debian/changelog	2009-07-29 09:29:53 UTC (rev 9202)
@@ -1,9 +1,11 @@
 python-django (1.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
-  * Ship FastCGI initscript and /etc/default file in python-django's examples
-    directory (Closes: #538863)
-  * Drop "05_10539-sphinx06-compatibility.diff"; it has been applied upstream.
+  * Merge from experimental:
+    - Ship FastCGI initscript and /etc/default file in python-django's examples
+      directory (Closes: #538863)
+    - Drop "05_10539-sphinx06-compatibility.diff"; it has been applied
+      upstream.
 
  -- Chris Lamb <lamby at debian.org>  Wed, 29 Jul 2009 11:13:50 +0200