X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/e51b15a5c889ef40c25751ec8bf43a5fc02df356..b2f281d78c0fa6ff0a92901a603098df6a5e57b2:/.mutt/alternates

diff --git a/.mutt/alternates b/.mutt/alternates
index ddd3494..1497b5b 100644
--- a/.mutt/alternates
+++ b/.mutt/alternates
@@ -1,16 +1,8 @@
 alternates 'madduck(\+.+)?@(.+\.)*madduck\.net'
 alternates (noc|abuse)@madduck\.net
 alternates madduck@debian\.(org|ch|net)
-alternates (madduck|press)@debconf\.org
-alternates treasurer@debian\.ch
-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
@@ -19,8 +11,6 @@ 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
@@ -31,6 +21,16 @@ 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 .+@tahi-ventures\.(cc|ch|com|de|eu|info|net|org)
+alternates .+@tahi\.(vc|cc|kiwi\.nz|ventures)
+alternates .+@grounded.ventures
+alternates .+@portfolio\.tahi\.v(c|entures)
+alternates martin@keyp\.io
+alternates m@rtin\.kiwi
+alternates squash(tc)?@thorndonclub\.co\.nz
 #alternates .+@(rw|int|home)\.madduck\.net
 
 # vim:ft=muttrc