From b4efec240d23193af9af73793abba9cc0329552b Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Thu, 4 Feb 2016 20:51:30 +0100
Subject: Hi, I'd like one bugfix release to go please!

---
 ChangeLog | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 21db20f..af9c3f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu, 04 Feb 2016 20:31:38 +0100
+
+* Release v2.14.1
+    * Skip a small set of build tests on Debian and derivatives, since they
+      trigger a Debian/Imlib2 bug. See
+      <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=812657> and
+      <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813729> for more
+      information
+    * Fix a segfault when combining --scale-down and --thumbnails on a
+      sufficiently large directory
+
 Sun, 04 Oct 2015 10:01:20 +0200
 
 * Release v2.14
-- 
cgit v1.2.3