summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-03-31 09:31:18 +0100
committerMichael Meeks <michael.meeks@collabora.com>2015-03-31 09:31:18 +0100
commit9c37db0ff845a0f424039e4a32a44cfe253a7cba (patch)
treebec385f88f649af3e0f542742cce1580a825ca27
parent27b8e1b5c9877854e3970b1494539f25f1dfd90d (diff)
Updates.
-rw-r--r--aliases5
-rw-r--r--domain-map2
2 files changed, 5 insertions, 2 deletions
diff --git a/aliases b/aliases
index c57861ca..45176f2f 100644
--- a/aliases
+++ b/aliases
@@ -218,10 +218,12 @@ michel.loiseleur@free.fr mloiseleur@linagora.com
tibbylickle@googlemail.com tibbylickle@gmail.com
eilidh.mcadam@gmail.com tibbylickle@gmail.com
eilidh@lanedo.com tibbylickle@gmail.com
+eilidh.mcadam@itomig.de tibbylickle@gmail.com
robert.nagy@gmail.com robert@openbsd.org
heinzlesspam@googlemail.com heinzlesspam@gmail.com
nemeth@openoffice.org nemeth@numbertext.org
nemeth@collabora.com nemeth@numbertext.org
+laszlo.nemeth@collabora.com nemeth@numbertext.org
andy.m.holder@googlemail.com andy.m.holder@gmail.com
christoph@dogmatux.com christoph.noack@documentfoundation.org
aurimas@gmail.com aurimas@members.fsf.org
@@ -325,11 +327,12 @@ tarun.k.kumar@ericsson.com tk7ua1678@gmail.com
# one time "via gerrit-commit"
gerrit@gerrit.libreoffice.org me@siqi.fr
matus.kukan@collabora.com matus.kukan@gmail.com
-andrze.hunt@collabora.com andrzej@ahunt.org
+andrzej.hunt@collabora.com andrzej@ahunt.org
reisi007@gmail.com florei@libreoffice.org
reisi.007@t-online.de florei@libreoffice.org
chris.sherlock@collabora.com chris.sherlock79@gmail.com
mihai.mv13@gmail.com mihai.varga@collabora.com
+hcastro@collabora.com hcvcastro@gmail.com
# Aliases to get affiliations right from Apache
chengjh@apache.org chengjh@unknown.ibm.com
diff --git a/domain-map b/domain-map
index ae1730fd..720970ed 100644
--- a/domain-map
+++ b/domain-map
@@ -101,7 +101,7 @@ kohei@openoffice.org Collabora <2015-01-17
markus.mohrhard@googlemail.com Assigned <2013-09-01
markus.mohrhard@googlemail.com Collabora
-markus.mohrhard@googlemail.com Assigned <2015-03-05
+markus.mohrhard@googlemail.com Assigned <2015-04-01
matus.kukan@gmail.com Assigned <2013-10-01
matus.kukan@gmail.com Collabora <2015-01-01