summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-01-28 20:33:22 +0000
committerMichael Meeks <michael.meeks@collabora.com>2015-01-28 20:33:22 +0000
commita6b5f495ae1183e2e3a11564cdc2b4196491e5c1 (patch)
tree78d36b772495680bb516692d22366c1ae555c039
parent2433af00e16255f078d94fc310e4656243406ecc (diff)
Update domain details.
-rw-r--r--aliases1
-rw-r--r--domain-map9
2 files changed, 7 insertions, 3 deletions
diff --git a/aliases b/aliases
index b76eaf4c..f8ef4e8c 100644
--- a/aliases
+++ b/aliases
@@ -328,6 +328,7 @@ matus.kukan@collabora.com matus.kukan@gmail.com
andrze.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
# Aliases to get affiliations right from Apache
chengjh@apache.org chengjh@unknown.ibm.com
diff --git a/domain-map b/domain-map
index 31eaa495..f4a4a1d3 100644
--- a/domain-map
+++ b/domain-map
@@ -97,13 +97,13 @@ muthusuba@gmail.com Collabora <2014-05-01
muthusuba@gmail.com Ericsson
kohei@openoffice.org SUSE <2013-09-01
-kohei@openoffice.org Collabora
+kohei@openoffice.org Collabora <2015-01-17
markus.mohrhard@googlemail.com Assigned <2013-09-01
markus.mohrhard@googlemail.com Collabora
matus.kukan@gmail.com Assigned <2013-10-01
-matus.kukan@gmail.com Collabora
+matus.kukan@gmail.com Collabora <2015-01-01
andrzej@ahunt.org Assigned <2013-12-03
andrzej@ahunt.org Collabora
@@ -112,7 +112,7 @@ l.lunak@collabora.com SUSE <2014-03-12
l.lunak@collabora.com Collabora
zolniatamas@caesar.elte.hu Assigned <2014-01-01
-zolniatamas@caesar.elte.hu Collabora
+zolniatamas@caesar.elte.hu Collabora <2015-01-01
quikee@gmail.com Assigned <2014-02-01
quikee@gmail.com Collabora
@@ -123,6 +123,9 @@ mrcekets@gmail.com Collabora
nemeth@numbertext.org Assigned <2014-10-01
nemeth@numbertext.org Collabora
+chris.sherlock79@gmail.com Assigned <2015-01-01
+chris.sherlock79@gmail.com Collabora
+
bubli@bubli.org SUSE <2011-08-01
bubli@bubli.org Assigned