X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c668c2c7e248286e978e53cb89c9195dcf526ae4..02ad54b46785c65dca55f41d4ae36bdc24cb7949:/debian/changelog?ds=inline

diff --git a/debian/changelog b/debian/changelog
index 2a3f729c5..248ae0969 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-ikiwiki (3.20141017) UNRELEASED; urgency=medium
+ikiwiki (3.20150108) UNRELEASED; urgency=medium
+
+  * Fix NULL ptr deref on ENOMEM in wrapper. (Thanks, igli)
+
+ -- Joey Hess <id@joeyh.name>  Sat, 24 Jan 2015 23:59:20 -0400
+
+ikiwiki (3.20150107) experimental; urgency=medium
 
   [ Joey Hess ]
   * Added ikiwiki-comment program.
@@ -30,8 +36,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 ]
+  * 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
+ -- Simon McVittie <smcv@debian.org>  Wed, 07 Jan 2015 09:13:58 +0000
 
 ikiwiki (3.20141016) unstable; urgency=medium