From: root <root@bombadil.infradead.org>
Date: Thu, 29 Sep 2011 12:21:29 +0000 (-0400)
Subject: Merge branch 'master' of bombadil:/home/dwmw2/public_git/eximconf
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bcbed5c0ac89d165c1f2ddd3acf60302848ad315;p=users%2Fdwmw2%2Feximconf.git

Merge branch 'master' of bombadil:/home/dwmw2/public_git/eximconf

Conflicts:
	conf/verify-except-senders
---

bcbed5c0ac89d165c1f2ddd3acf60302848ad315
diff --cc conf/verify-except-senders
index 221578e,b6cc341..f5752ee
--- a/conf/verify-except-senders
+++ b/conf/verify-except-senders
@@@ -30,16 -30,9 +30,22 @@@ moblin.org: mobli
  www.cowonglobal.com: *
  #meego.com: *
  gatey.sixxs.net: www-data
 +s119.mlgus.com: *
 +s100.mlgus.com: *
 +s118.mlgus.com: *
 +s105.mlgus.com: *
 +s112.mlgus.com: *
 +s106.mlgus.com: *
 +s104.mlgus.com: *
 +s505.mlgus.com: *
 +s101.mlgus.com: *
 +s102.mlgus.com: *
 +s103.mlgus.com: *
 +mlgus.com: *
 +battle.net: noreply
+ a.speechless.aaisp.net.uk: *
+ b.speechless.aaisp.net.uk: *
+ c.speechless.aaisp.net.uk: *
+ qualcomm.com: staffing
+ intel.com: staffing.no.reply
+ windmobile.ca: noreply