summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-05-03 15:14:35 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-05-03 15:14:35 +0200
commit6c4309db352f0445bcd340c41c6942ad3979d858 (patch)
treef7bea154aa2a9e5645c2c3ec784c0318dd452299
parentf77b7147c4e7d98608b448c3730fa1d5fea8e669 (diff)
wiki/ml additions
-rw-r--r--aliases4
-rw-r--r--wiki-license.csv17
2 files changed, 18 insertions, 3 deletions
diff --git a/aliases b/aliases
index e1f2dfce..b65a43a4 100644
--- a/aliases
+++ b/aliases
@@ -93,14 +93,13 @@ fridrich.strba@bluwin.ch fridrich.strba@bluewin.ch
fridrich.strba@graduateinstitute.ch fridrich.strba@bluewin.ch
tlillqvist@novell.com tml@iki.fi
tml@hemulen.(none) tml@iki.fi
-tml@iki.fi tml@iki.fi
tml@novell.com tml@iki.fi
tml@openoffice.org tml@iki.fi
tlillqvist@suse.com tml@iki.fi
tml@collabora.com tml@iki.fi
jody@gnome.org jody@novell.com
-jsk@openoffice.org jsk@openoffice.org
Joerg.Skottke@Sun.COM jsk@openoffice.org
+"Joerg Skottke [jsk] jsk@openoffice.org" jsk@openoffice.org
skotti@buster skotti@buster.gleitmeier.de
skotti@wintermute skotti@buster.gleitmeier.de
robert.sedak@sk.htnet.hr robert.sedak@sk.t-com.hr
@@ -335,6 +334,7 @@ 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
+markus.mohrhard@collabora.co.uk markus.mohrhard@googlemail.com
# Aliases to get affiliations right from Apache
chengjh@apache.org chengjh@unknown.ibm.com
diff --git a/wiki-license.csv b/wiki-license.csv
index bbc83168..37289687 100644
--- a/wiki-license.csv
+++ b/wiki-license.csv
@@ -639,8 +639,23 @@ Tim Markle,{{nospam|tmarkle7|gmail|com}},all,wiki to ml
Tobias Lippert,{{nospam|drtl|fastmail|fm}},all,wiki to ml
Vort,{{nospam|vvort|yandex|ru}},all,wiki to ml
Zika L'Etrange,{{nospam|zika.letrange|gmail|com}},all,wiki to ml
-
#
+# to 2014-03-31
+#
+Alex Henrie,{{nospam|alexhenrie24|gmail|com}},all,wiki to ml
+Trent MacAlpine,{{nospam|tmacalp|gmail|com}},all,wiki to ml
+Sujay M,{{nospam|sujaym.sujaym|gmail|com}},all,wiki to ml
+Jason Gerlowski,{{nospam|gerlowskija|gmail|com}},all,wiki to ml
+Matteo Campanelli,{{nospam|matteo.campanelli|gmail|com}},all,wiki to ml
+Manmeet Singh,{{nospam|gdm.manmeet|gmail|com}},all,wiki to ml
+Manas Joshi,{{nospam|futurejoshi15|gmail|com}},all,wiki to ml
+Szymon Kłos,{{nospam|eszkadev|gmail|com}},all,wiki to ml
+Darshana Padmadas,{{nospam|darshanapadmadas|gmail|com}},all,wiki to ml
+Mohamed-Ali Ben Mansour,{{nospam|medalibenmansour|gmail|com}},all,wiki to ml
+Valentin Kettner,{{nospam|vakevk|gmail|com}},all,wiki to ml
+Brad Woosley,{{nospam|bwoosley2|gmail|com}},all,wiki to ml
+Mathias Supp,{{nospam|Mathias.Supp|vector|com}},all,wiki to ml
+
# In order to ensure these individuals' changing affiliations are
# honoured, and also to ensure that their aliases resolve to a
# single person, we annotate their assignment in domain-map with an