merge updates from bombadil

diff --git a/conf/verify-except-senders b/conf/verify-except-senders
index 7970f20f3bca9d6f86902ef6aeeb8e7c4052ce3f..bc04d8e9c5a72187f5c04bb7cafe73b0bcdfc906 100644 (file)
--- a/conf/verify-except-senders
+++ b/conf/verify-except-senders
@@ -1,3 +1,7 @@
+466817-web2.eservicesgroup.net: apache
+bugs.documentfoundation.org: bugzilla-daemon
+email.costacoffeeclub.co.uk: *
+givex.com: costacoffeeclub
 google.com: forwarding-noreply
 aircanada.com: confirmation
 payments.certapay.com: notify
@@ -70,3 +74,6 @@ recordings.aa.net.uk: *
 ybs.matshost.co.uk: *
 adobe.com: cs-auto
 regonline.com: events
+forum.yubico.com: www-data
+b.blameless.aa.net.uk: www-data
+fedorahosted.org: trac