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

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

diff --git a/debian/changelog b/debian/changelog
index 2a3f729c57b785ebcf3269a45c4d8ee7e297d702..de3ee01b0ed66d6412ede91021162f115d58dc45 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,11 @@ ikiwiki (3.20141017) UNRELEASED; urgency=medium
     Thanks, Mark Jason Dominus
   * build: in po/Makefile, use the same $(MAKE) as the rest of the build.
     Thanks, ttw
+  * blogspam: use the 2.0 JSON API (the 1.0 XML-RPC API has been EOL'd).
+
+  [ Joey Hess ]
+  * po: If msgmerge falls over on a problem po file, print a warning
+    message, but don't let this problem crash ikiwiki entirely.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 20 Oct 2014 12:04:49 -0400