X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/8a98440db6454fc8653c264f61502bd0d1d6baf8..f88e109bec4df70875a72f5044b8940eefbdd26e:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 2a3f729c5..b8a74935f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,10 @@ ikiwiki (3.20141017) UNRELEASED; urgency=medium
   * 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
 
 ikiwiki (3.20141016) unstable; urgency=medium