summaryrefslogtreecommitdiff
path: root/aliases
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-09-06 09:22:32 +0100
committerMichael Meeks <michael.meeks@suse.com>2013-09-06 09:22:32 +0100
commitfc1ed46a85d2b8ea9fe069ac188dcf7d83fa6389 (patch)
treec36cd4368b4a4c9e47799f20901aff3a2ee9d1c3 /aliases
parent10290b80dde9d4b4e24c98084e748c69223e0bfd (diff)
Add Collabora affiliations.
Diffstat (limited to 'aliases')
-rw-r--r--aliases34
1 files changed, 18 insertions, 16 deletions
diff --git a/aliases b/aliases
index 7cd7fe93..baff865c 100644
--- a/aliases
+++ b/aliases
@@ -32,16 +32,16 @@ olivier.hallot@alta.org.br olivier.hallot@documentfoundation.org
olivier.hallot@edx.srv.br olivier.hallot@documentfoundation.org
malte.timmermann@sun.com mt@openoffice.org
malte.timmermann@oracle.com mt@openoffice.org
-mmeeks@openoffice.org michael.meeks@novell.com
-michael.meeks@suse.com michael.meeks@novell.com
-mmeeks@suse.com michael.meeks@novell.com
+michael.meeks@novell.com mmeeks@openoffice.org
+michael.meeks@suse.com mmeeks@openoffice.org
+mmeeks@suse.com mmeeks@openoffice.org
ocke.janssen@sun.com oj@openoffice.org
ocke.janssen@oracle.com oj@openoffice.org
-Kohei@lenovo-quad.(none) kyoshida@novell.com
-kyoshida@kohei-lenovo.(none) kyoshida@novell.com
-kohei@openoffice.org kyoshida@novell.com
-kohei.yoshida@suse.com kyoshida@novell.com
-kohei.yoshida@gmail.com kyoshida@novell.com
+Kohei@lenovo-quad.(none) kohei@openoffice.org
+kyoshida@kohei-lenovo.(none) kohei@openoffice.org
+kyoshida@novell.com kohei@openoffice.org
+kohei.yoshida@suse.com kohei@openoffice.org
+kohei.yoshida@gmail.com kohei@openoffice.org
noel.power@novell.com npower@openoffice.org
npower@linux-h0uc.site npower@openoffice.org
nopower@novell.com npower@openoffice.org
@@ -86,11 +86,12 @@ fstrba@strbalenovo.localdomain fridrich.strba@bluewin.ch
fstrba@strbadell.localdomain fridrich.strba@bluewin.ch
fridrich_strba@openoffice.org fridrich.strba@bluewin.ch
fridrich.strba@bluwin.ch fridrich.strba@bluewin.ch
-tml@hemulen.(none) tlillqvist@novell.com
-tml@iki.fi tlillqvist@novell.com
-tml@novell.com tlillqvist@novell.com
-tml@openoffice.org tlillqvist@novell.com
-tlillqvist@suse.com tlillqvist@novell.com
+tlillqvist@novell.com tml@iki.fi
+tml@hemulen.(none) tml@iki.fi
+tml@iki.fi tml@iki.fi
+tml@novell.com tml@iki.fi
+tml@openoffice.org tml@iki.fi
+tlillqvist@suse.com tml@iki.fi
jody@gnome.org jody@novell.com
jsk@openoffice.org jsk@openoffice.org
Joerg.Skottke@Sun.COM jsk@openoffice.org
@@ -144,8 +145,8 @@ kamihir@freemail.hu kami911@gmail.com
"kami@darth.(none)" kami911@gmail.com
"libo64@libo64.(none)" kami911@gmail.com
"libo32@libo32.(none)" kami911@gmail.com
-muthusuba@gmail.com sumuthu@novell.com
-sumuthu@suse.com sumuthu@novell.com
+sumuthu@novell.com muthusuba@gmail.com
+sumuthu@suse.com muthusuba@gmail.com
timar@gnome.hu timar@fsf.hu
atimar@suse.com timar@fsf.hu
atimar@novell.com timar@fsf.hu
@@ -167,7 +168,8 @@ nigel.hawkins@inmail24.com n.hawkins@gmx.com
n.hawkins-KK0ffGbhmjU@public.gmane.org n.hawkins@gmx.com
br@blankpage.ch bero@arklinux.ch
kayo.hamid@gekkolinux.com.br revol.code@yahoo.com
-kendy@noe.suse.cz kendy@suse.cz
+kendy@suse.cz kendy@notthere.aliasdomain.foo
+kendy@noe.suse.cz kendy@notthere.aliasdomain.foo
Thorsten.Bosbach@Oracle.Com tbo@OpenOffice.org
"christina rossmanith" chrrossmanith@web.de
chr.rossmanith@gmx.de chrrossmanith@web.de