X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c668c2c7e248286e978e53cb89c9195dcf526ae4..bd8198fb77ed5cf77ddeb860ca1ac983bfaacbbd:/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