X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/94e32abece4f7175e657eb6b0f20968eb320fa02..0beb89cbab76581e957b75bb512d220e4fad201b:/.mutt/alternates

diff --git a/.mutt/alternates b/.mutt/alternates
index ae99076..5440e65 100644
--- a/.mutt/alternates
+++ b/.mutt/alternates
@@ -1,35 +1,29 @@
-alternates 'madduck(\+.+)?@madduck\.net'
+alternates 'madduck(\+.+)?@(.+\.)*madduck\.net'
+alternates (noc|abuse)@madduck\.net
 alternates madduck@debian\.(org|ch|net)
-alternates madduck@acm\.org
-alternates madduck@ieee\.org
-alternates madduck@madduck\.dhs\.org
-alternates madduck@flix\.de
+alternates (madduck|accounting)@debconf\.org
 alternates madduck@(.+\.)?sccs\.swarthmore\.edu
-alternates mkrafft1@swarthmore\.edu
-alternates krafft@(.+\.)?cs.swarthmore\.edu
-alternates mkrafft@ch-open\.ch
 alternates krafft@ifi\.u(ni)?zh\.ch
 alternates krafft@ailab\.ch
 alternates m(artin.)?krafft@sudetia\.de
 alternates mkrafft@aerasec\.de
-alternates .+@(mass|pobox|usenet|forward)\.madduck\.net
-alternates (([ph]ost|web)master|root|abuse)@(.+\.)?madduck\.net
-alternates (([ph]ost|web)master|root|abuse)@(.+\.)?ailab\.ch
-alternates (madduck|changes|errata|feedback)@debian-?(system|book)\.info
-alternates (([ph]ost|web)master|root|abuse)@debian-?(system|book)\.info
-alternates (([ph]ost|web)master|root|abuse)@(.+\.)?martin-krafft\..+
+alternates .+@(pobox|usenet)\.madduck\.net
+alternates (madduck|changes|errata|feedback|contact|info)@debian-?(system|book)\.info
 alternates .+@martin-krafft\..+
 alternates martin\.krafft@(lero|(staffmail\.)?ul)\.ie
-alternates madduck@skynet\.ie
-alternates .+@neokon\.(ch|net|eu)
 alternates .+@pantsfullofunix\.net
 alternates .+@limerence\.org
 alternates .+@belligerence\.net
 alternates ma(rtin|dduck)@alpinflegel\.de
 alternates ma(rtin|dduck)@krafftwerk\..+
-alternates martin@krafft.(de|ch)
-alternates .+@blog\.madduck\.net
-alternates .+@(rw|int|home)\.madduck\.net
-alternates (contact|info|feedback|errata)@debiansystem.info
+alternates k(bk|gf)g@krafftwerk\.de
+alternates martin@krafft\.(de|ch|ie)
+alternates comments\+.+@blog\.madduck\.net
+alternates .+@hanfstaenglstrasse\.de
+alternates martin\.krafft@uni-wh\.de
+alternates martin\.krafft@mtfk\.(org|de)
+alternates madduck@fsfe\.org
+alternates martin\.krafft@teckids\.org
+#alternates .+@(rw|int|home)\.madduck\.net
 
 # vim:ft=muttrc