Merge branch 'nd/export-worktree' into maint

diff --git a/contrib/hooks/multimail/CHANGES b/contrib/hooks/multimail/CHANGES
index 0b823d8f5f6eaa13f900bfbb0152383b32be20b8..6bb12306b8210ea2d7ae58d6e997801ec44e1604 100644 (file)
--- a/contrib/hooks/multimail/CHANGES
+++ b/contrib/hooks/multimail/CHANGES
@@ -1,3 +1,8 @@
+Release 1.1.1 (bugfix-only release)
+===================================
+
+* The SMTP mailer was not working with Python 2.4.
+
 Release 1.1.0
 =============