Merge remote-tracking branch 'intrigeri/po-long-language-codes'

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

diff --git a/debian/changelog b/debian/changelog
index 9d1278eb16d74364dd981c05ed6c6f7fa0da8afe..5ca986bee772cd9dc58821607399462c46cfacde 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (3.20110431) UNRELEASED; urgency=low
   * Add additional directive quoting styles, to better support nested
     directives. Both triple-single-quote and heredoc quotes can be used.
     (Thanks, Timo Paulssen)
   * Add additional directive quoting styles, to better support nested
     directives. Both triple-single-quote and heredoc quotes can be used.
     (Thanks, Timo Paulssen)

+  * Changed license of madduck's python plugins from GPL-2 to BSD-2-clause.

 
  -- Joey Hess <joeyh@debian.org>  Thu, 05 May 2011 13:02:19 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Thu, 05 May 2011 13:02:19 -0400