release

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

diff --git a/debian/changelog b/debian/changelog
index 2a3f729c57b785ebcf3269a45c4d8ee7e297d702..89e587737d0e259519268dc6fa5f6a2471837ded 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20141017) UNRELEASED; urgency=medium
+ikiwiki (3.20150107) experimental; urgency=medium
 
   [ Joey Hess ]
   * Added ikiwiki-comment program.
@@ -30,8 +30,14 @@ 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).
+    Closes: #774441
 
- -- Joey Hess <joeyh@debian.org>  Mon, 20 Oct 2014 12:04:49 -0400
+  [ 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.
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 07 Jan 2015 09:13:58 +0000
 
 ikiwiki (3.20141016) unstable; urgency=medium