Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/debian/changelog b/debian/changelog
index 5c00648450ac55a8c0aeb5c8c922567865c4ae78..440bee34f6c0c2bd7b211a867126ee5ea82f6a7e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-ikiwiki (3.20100723) UNRELEASED; urgency=low
+ikiwiki (3.20100805) UNRELEASED; urgency=low
+
+  * filecheck: Fall back to using the file command if the freedesktop
+    magic file cannot identify a file.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 09 Aug 2010 13:18:28 -0400
+
+ikiwiki (3.20100804) unstable; urgency=low
 
   * template: Fix dependency tracking. Broken in version 3.20100427.
   * po: The po_slave_languages setting is now a list, so the order of
@@ -13,7 +20,7 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low
   * Fixes a bug that prevented matching deleted pages when using the page()
     PageSpec.
 
- -- Joey Hess <joeyh@debian.org>  Fri, 23 Jul 2010 14:00:32 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 04 Aug 2010 09:20:52 -0400
 
 ikiwiki (3.20100722) unstable; urgency=low