summaryrefslogtreecommitdiff
path: root/aliases
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2013-09-18 14:33:08 +0100
committerMichael Meeks <michael.meeks@collabora.com>2013-09-18 14:33:08 +0100
commitabf95cfe917f4226171bb76270dffc9f586ac491 (patch)
tree0e66221eaeca70fced17e530d34ffe57284620a5 /aliases
parenteeeb0e2f51848e73fa17613b944955260766156f (diff)
cleanup Collabora affiliations.
Diffstat (limited to 'aliases')
-rw-r--r--aliases7
1 files changed, 7 insertions, 0 deletions
diff --git a/aliases b/aliases
index e6356bf9..ef7a369e 100644
--- a/aliases
+++ b/aliases
@@ -42,6 +42,7 @@ 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
+kohei.yoshida@collabora.com kohei@openoffice.org
noel.power@novell.com npower@openoffice.org
npower@linux-h0uc.site npower@openoffice.org
nopower@novell.com npower@openoffice.org
@@ -92,6 +93,7 @@ tml@iki.fi tml@iki.fi
tml@novell.com tml@iki.fi
tml@openoffice.org tml@iki.fi
tlillqvist@suse.com tml@iki.fi
+tml@collabora.com tml@iki.fi
jody@gnome.org jody@novell.com
jsk@openoffice.org jsk@openoffice.org
Joerg.Skottke@Sun.COM jsk@openoffice.org
@@ -147,9 +149,11 @@ kamihir@freemail.hu kami911@gmail.com
"libo32@libo32.(none)" kami911@gmail.com
sumuthu@novell.com muthusuba@gmail.com
sumuthu@suse.com muthusuba@gmail.com
+sumuthu@collabora.com muthusuba@gmail.com
timar@gnome.hu timar@fsf.hu
atimar@suse.com timar@fsf.hu
atimar@novell.com timar@fsf.hu
+andras.timar@collabora.com timar@fsf.hu
foskey@optushome.com.au waratah@openoffice.org
shtylman@namlyths.(none) shtylman@gmail.com
ms93807@x4240-so5 ms93807@x4240-so3
@@ -170,6 +174,7 @@ br@blankpage.ch bero@arklinux.ch
kayo.hamid@gekkolinux.com.br revol.code@yahoo.com
kendy@suse.cz kendy@notthere.aliasdomain.foo
kendy@noe.suse.cz kendy@notthere.aliasdomain.foo
+kendy@collabora.com kendy@notthere.aliasdomain.foo
Thorsten.Bosbach@Oracle.Com tbo@OpenOffice.org
"christina rossmanith" chrrossmanith@web.de
chr.rossmanith@gmx.de chrrossmanith@web.de
@@ -179,6 +184,8 @@ jens-heiner.rechtien@oracle.com hr@openoffice.org
thomas.benisch@oracle.com tbe@openoffice.org
vmiklos@openoffice.org vmiklos@frugalware.org
vmiklos@suse.cz vmiklos@frugalware.org
+vmiklos@collabora.com vmiklos@frugalware.org
+vmiklos@collabora.co.uk vmiklos@frugalware.org
jani@ubuntu.com jani.monoses@canonical.com
christian@twotoasts.de christian.dywan@lanedo.com
christian@lanedo.com christian.dywan@lanedo.com