merge po

diff --git a/debian/changelog b/debian/changelog
index ea6356f724145940221eafff66e7905cf90c673d..4e9a92eabd02ea924bf6b1fa08a9a3f45910f001 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ ikiwiki (3.20101202) UNRELEASED; urgency=low
   * 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.
+  * po: do not override homepage title when it was overridden. (intrigeri)
+  * Set HTML::Template's parent_global_vars option to allow using parameters
+    like title_overridden that do not appear on the template. (intrigeri)
+    (See https://rt.cpan.org/Public/Bug/Display.html?id=64158)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 29 Nov 2010 14:44:13 -0400
 

diff --git a/doc/bugs/po:_plugin_should_not_override_the_title_on_the_homepage.mdwn b/doc/bugs/po:_plugin_should_not_override_the_title_on_the_homepage.mdwn
index ed26a5a3fa1a19343c0bcd1b9287ade8aacd1b49..8f9374707cd8c352666ac4ff95231895783b962a 100644 (file)
--- a/doc/bugs/po:_plugin_should_not_override_the_title_on_the_homepage.mdwn
+++ b/doc/bugs/po:_plugin_should_not_override_the_title_on_the_homepage.mdwn
@@ -54,3 +54,5 @@ Thanks.
 >>> But still, I think we need to apply the workaround as
 >>> HTML::Template's author has not updated any dist on CPAN for more
 >>> than one year. --[[intrigeri]]
+
+>>>> All merged, [[done]]. --[[Joey]]