summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2017-01-30 17:01:36 +0000
committerMichael Meeks <michael.meeks@collabora.com>2017-01-30 17:01:57 +0000
commit8209f8cc461cda5c0244e5010efbbbc2907502c5 (patch)
treef851cadc15e65a117fdd1184ca509655c6b45839
parent30a1ca8b6c580da62d9c7a8beb57c46cb323dcbf (diff)
Add missing affiliations, and alias.HEADmaster
-rw-r--r--aliases1
-rw-r--r--domain-map24
2 files changed, 21 insertions, 4 deletions
diff --git a/aliases b/aliases
index 34318353..43f877c3 100644
--- a/aliases
+++ b/aliases
@@ -54,6 +54,7 @@ kmachalkova@suse.cz bubli@bubli.org
kmachalkova@ben.suse.cz bubli@bubli.org
kmachalkova@novell.com bubli@bubli.org
jiri.burant92@gmail.com burant.j@seznam.cz
+cedricbosdo@openoffice.org cedric.bosdonnat.ooo@free.fr
cbosdonnat@novell.com cedric.bosdonnat.ooo@free.fr
cedric.bosdonnat@free.fr cedric.bosdonnat.ooo@free.fr
trtle@yahoo.com chaqou@gmail.com
diff --git a/domain-map b/domain-map
index 0be1f261..ff43a604 100644
--- a/domain-map
+++ b/domain-map
@@ -26,9 +26,9 @@ thb@openoffice.org CIB
cmc@openoffice.org Oracle <2004-03-01
cmc@openoffice.org RedHat
-cedricbosdo@openoffice.org (Unknown) <2008-12-01
-cedricbosdo@openoffice.org SUSE <2013-09-15
-cedricbosdo@openoffice.org Assigned
+cedric.bosdonnat.ooo@free.fr (Unknown) <2008-12-01
+cedric.bosdonnat.ooo@free.fr SUSE <2013-09-15
+cedric.bosdonnat.ooo@free.fr Assigned
fridrich.strba@bluewin.ch (Unknown) <2007-03-01
fridrich.strba@bluewin.ch SUSE <2013-09-15
@@ -38,11 +38,17 @@ timar@fsf.hu Assigned <2011-04-04
timar@fsf.hu SUSE <2013-09-01
timar@fsf.hu Collabora
+pranav913@gmail.com Assigned <2016-01-20
+pranav913@gmail.com Collabora
+
b_michaelsen@openoffice.org Oracle <2011-02-01
b_michaelsen@openoffice.org Canonical
ccheney@ubuntu.com Canonical
+ + farakuzun@mail.com
+ + ozcanesen@gmail.com
+
gquigs@gmail.com Canonical
federico@ximian.com SUSE
@@ -159,6 +165,14 @@ olivier.hallot@edx.srv.br TDF
noelgrandin@gmail.com Peralex <2016-09-12
noelgrandin@gmail.com Collabora
+farakuzun@mail.com Assigned <2015-12-09
+farakuzun@mail.com Collabora <2017-01-31
+farakuzun@mail.com Assigned
+
+ozcanesen@gmail.com Assigned <2015-12-09
+ozcanesen@gmail.com Collabora <2017-01-31
+ozcanesen@gmail.com Assigned
+
cloph@openoffice.org TDF
jani@documentfoundation.org TDF
@@ -259,6 +273,7 @@ xamarin.com Xamarin
cib.de CIB
itomig.de ITOMIG
peralex.com Peralex
+kolabsys.com Kolab
# Added to provide consistencty with Wiki
conectiva.com Conectiva
@@ -266,7 +281,8 @@ conectiva.com.br Conectiva
bogus-non-domain Bogus
mandriva.com Mandriva
credativ.com Credativ
-codeweavers.com Codeweavers
+codeweavers.com Codeweavers
connectiva Connectiva
suse.de Suse
mandrake.com Mandrake
+