Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/debian/changelog b/debian/changelog
index 824a0061c454d178008a4bf2dee3d37264aa4ef7..b8a74935fbaf3ab01aa3614aec8434578596c6f5 100644 (file)
--- 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