X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/5c30886dbf38689668a47414283f8dc4e895ec7d..4ce18a7f4a85c5ba2cea73dc2dab093bc44ea934:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 824a0061c..b8a74935f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,12 @@ ikiwiki (3.20141017) UNRELEASED; urgency=medium
   [ Amitai Schlair ]
   * core: log a debug message before waiting for the lock.
     Thanks, Mark Jason Dominus
+  * build: in po/Makefile, use the same $(MAKE) as the rest of the build.
+    Thanks, ttw
+
+  [ 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