Merge remote branch 'upstream/master' into prv/po

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index fae2f15b4f7f83d4cfeec1a629d3e5782cebe79c..ea6356f724145940221eafff66e7905cf90c673d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ ikiwiki (3.20101202) UNRELEASED; urgency=low
     need to re-login. (smcv)
   * inline: Display feed buttons for nested inlines, linking to the inlined
     page's feed. (Giuseppe Bilotta)
+  * goldtype: New theme, based on blueview, contributed by Lars Wirzenius.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 29 Nov 2010 14:44:13 -0400