summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2016-09-29 17:13:57 +0100
committerMichael Meeks <michael.meeks@collabora.com>2016-09-29 17:13:57 +0100
commitc29b17a20eb312bd5da90c9a0dc1266538988eb9 (patch)
treed1d5a8da5a88aa2ed80c40159370cb785a7db14d
parent595bc2afd044cee4374e111dbf43c54efb86d884 (diff)
Update affiliations.
-rw-r--r--aliases2
-rw-r--r--domain-map15
2 files changed, 12 insertions, 5 deletions
diff --git a/aliases b/aliases
index 003493eb..f8cf74aa 100644
--- a/aliases
+++ b/aliases
@@ -322,7 +322,7 @@ marcospdss.org@gmail.com marcos.souza.org@gmail.com
doko@canonical.com matthias.klose@canonical.com
msvec@suse.com msvec@novell.com
nicolas.christener@adfinis-sygroup.ch nc@adfinis.com
-noelgrandin@gmail.com noel@peralex.com
+noel@peralex.com noelgrandin@gmail.com
gautier.shopie@gmail.com gautier.sophie@gmail.com
"alexander@Notebook-Alexander.(none)" alexander.wilms@zoho.com
root@linux-dre0.site zolniatamas@caesar.elte.hu
diff --git a/domain-map b/domain-map
index e83c99fa..5b5f7e4d 100644
--- a/domain-map
+++ b/domain-map
@@ -103,11 +103,13 @@ kendy@notthere.aliasdomain.foo Collabora
muthusuba@gmail.com Assigned <2010-05-02
muthusuba@gmail.com SUSE <2013-09-01
muthusuba@gmail.com Collabora <2014-05-01
-muthusuba@gmail.com Ericsson
+muthusuba@gmail.com Ericsson <2016-01-01
+muthusuba@gmail.com Assigned
kohei@openoffice.org SUSE <2013-09-01
kohei@openoffice.org Collabora <2015-01-17
-kohei@openoffice.org Assigned
+kohei@openoffice.org Assigned <2016-09-19
+kohei@openoffice.org Collabora
markus.mohrhard@googlemail.com Assigned <2013-09-01
markus.mohrhard@googlemail.com Collabora <2015-04-01
@@ -122,11 +124,13 @@ andrzej@ahunt.org Collabora <2015-12-01
andrzej@ahunt.org Assigned
l.lunak@collabora.com SUSE <2014-03-12
-l.lunak@collabora.com Collabora
+l.lunak@collabora.com Collabora <2016-06-20
+l.lunak@collabora.com (Unknown)
zolniatamas@caesar.elte.hu Assigned <2014-01-01
zolniatamas@caesar.elte.hu Collabora <2015-01-01
-zolniatamas@caesar.elte.hu Assigned
+zolniatamas@caesar.elte.hu Assigned <2016-09-01
+zolniatamas@caesar.elte.hu Collabora
quikee@gmail.com Assigned <2014-02-01
quikee@gmail.com Collabora
@@ -152,6 +156,9 @@ olivier.hallot@edx.srv.br Assigned <2015-11-20
olivier.hallot@edx.srv.br Collabora <2016-04-01
olivier.hallot@edx.srv.br TDF
+noelgrandin@gmail.com Peralex <2016-09-12
+noelgrandin@gmail.com Collabora
+
cloph@openoffice.org TDF
jani@documentfoundation.org TDF