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 c693be51367d73b8a9b2d384c67a673ac8613209..ccf45df94e8f7999fa4a0912961901669b36196e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.20091203) UNRELEASED; urgency=low
 
   * cvs: Add missing bit to Automator.
 ikiwiki (3.20091203) UNRELEASED; urgency=low
 
   * cvs: Add missing bit to Automator.

+  * Add complete Spanish basewiki translation done by Fernando Gonzalez de
+    Requena.

 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Dec 2009 17:22:21 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Dec 2009 17:22:21 -0500
 


@@ -39,7 +41,7 @@ ikiwiki (3.20091113) unstable; urgency=low
   * httpauth: Add cgiauthurl setting that can be used to do http basic auth
     only when ikiwiki needs authentication, rather than for any access to 
     the cgi/wiki.
   * httpauth: Add cgiauthurl setting that can be used to do http basic auth
     only when ikiwiki needs authentication, rather than for any access to 
     the cgi/wiki.

-  * inline: Do not generated feeds for nested inlines.
+  * inline: Do not generate feeds for nested inlines.

   * inline: Allow direct inclusion of non-page files in raw mode.
   * inline: Fix display of all pages when archive=yes or show=0 are used.
 
   * inline: Allow direct inclusion of non-page files in raw mode.
   * inline: Fix display of all pages when archive=yes or show=0 are used.