From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 6 Oct 2014 13:25:52 +0000 (+0100)
Subject: Merge remote branch 'origin/master'
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~webstump/git?a=commitdiff_plain;h=cb2220b4847b84df144c3b2b59d80b039c8b210b;hp=52f7b207e0f61dfd4ee81f98edf5cf218e3e9e53;p=modbot-ulm.git

Merge remote branch 'origin/master'
---

diff --git a/.gitignore b/.gitignore
index 1b1e591..fa708eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,8 @@
 /stump/etc/modack.received
 /stump/etc/modack.approved.new
 /stump/etc/modack.received.new
+/stump/etc/procmail/save-approved
+/stump/etc/procmail/save-rejected
 /stump/etc/moderators
 /stump/etc/sanitise_and_quote_email
 /stump/etc/messages/*[^N]?