Merge branch 'debian-testing'

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 7f3ea7290ae4f24b4edff53b072435f6aaee6682..b9b08050b61f8293fcb7570a2e246ecb5cf0f1df 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,19 @@
-ikiwiki (3.20100805) UNRELEASED; urgency=low
+ikiwiki (3.20100816) UNRELEASED; urgency=low

 
   * filecheck: Fall back to using the file command if the freedesktop
     magic file cannot identify a file.
   * flattr: New plugin. (Thanks to jaywalk for the initial implementation
     at a flattr plugin! This one is less configurable, but simpler.)
   * smiley: warn instead of error for missing smileys (Giuseppe Bilotta)
 
   * filecheck: Fall back to using the file command if the freedesktop
     magic file cannot identify a file.
   * flattr: New plugin. (Thanks to jaywalk for the initial implementation
     at a flattr plugin! This one is less configurable, but simpler.)
   * smiley: warn instead of error for missing smileys (Giuseppe Bilotta)

+
+ -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:45:48 -0400
+
+ikiwiki (3.20100815) unstable; urgency=medium
+

   * Fix po test suite to not assume ikiwiki's underlay is already installed.
     Closes: #593047
 
   * Fix po test suite to not assume ikiwiki's underlay is already installed.
     Closes: #593047
 

- -- Joey Hess <joeyh@debian.org>  Mon, 09 Aug 2010 13:18:28 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:42:55 -0400

 
 ikiwiki (3.20100804) unstable; urgency=low
 
 
 ikiwiki (3.20100804) unstable; urgency=low