summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-12-14 02:01:42 +0000
committerMichael Meeks <michael.meeks@collabora.com>2015-12-14 02:01:52 +0000
commit0186dc415b6c1d2c87e0cf4bba22b8496452c421 (patch)
tree12a5d6200cc9f6bc93956d87f1cf8d50aa5a8f6a
parent6c6eba9a57f719090ccbf575f90e83fb24e4048c (diff)
Update Olivier & Ash.
-rw-r--r--aliases2
-rw-r--r--domain-map8
2 files changed, 8 insertions, 2 deletions
diff --git a/aliases b/aliases
index 155cdb28..b5744cbd 100644
--- a/aliases
+++ b/aliases
@@ -33,6 +33,7 @@ philipp.lohmann@oracle.com pl@openoffice.org
dirfin@broffice.org olivier.hallot@documentfoundation.org
olivier.hallot@alta.org.br olivier.hallot@documentfoundation.org
olivier.hallot@edx.srv.br olivier.hallot@documentfoundation.org
+ohallot@collabora.co.uk olivier.hallot@documentfoundation.org
malte.timmermann@sun.com mt@openoffice.org
malte.timmermann@oracle.com mt@openoffice.org
michael.meeks@novell.com mmeeks@openoffice.org
@@ -338,6 +339,7 @@ chris.sherlock@collabora.com chris.sherlock79@gmail.com
mihai.mv13@gmail.com mihai.varga@collabora.com
hcastro@collabora.com hcvcastro@gmail.com
markus.mohrhard@collabora.co.uk markus.mohrhard@googlemail.com
+ashod.nakashian@collabora.co.uk ashodnakashian@yahoo.com
# Aliases to get affiliations right from Apache
chengjh@apache.org chengjh@unknown.ibm.com
diff --git a/domain-map b/domain-map
index 33a54746..ad2e0d6c 100644
--- a/domain-map
+++ b/domain-map
@@ -49,8 +49,6 @@ federico@ximian.com SUSE
kstribley@openoffice.org SIL
-olivier.hallot@documentfoundation.org ALTA
-
sb@openoffice.org Oracle <2011-08-30
sb@openoffice.org RedHat
@@ -148,6 +146,12 @@ mihai.mv13@gmail.com Collabora
hcvcastro@gmail.com Assigned <2015-03-09
hcvcastro@gmail.com Collabora
+olivier.hallot@edx.srv.br Assigned <2015-11-20
+olivier.hallot@edx.srv.br Collabora
+
+ashodnakashian@yahoo.com Assigned <2015-12-12
+ashodnakashian@yahoo.com Collabora
+
me@siqi.fr Assigned <2015-03-01
me@siqi.fr Collabora