summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2016-07-25 15:47:24 +0200
committerGitHub <noreply@github.com>2016-07-25 15:47:24 +0200
commite9baf6963af30f293d05079222e2881b0989ed1a (patch)
tree3880d0b6df16c5fbec3916e96764e5e7f56b50e8 /.mailmap
parent98df8089bea1b2407c46495b6c2eb76dda46c658 (diff)
parent0f1da52b5e4812db22a54920361be8aeba2b7ba4 (diff)
Merge pull request #3796 from poettering/mailmap
documentation, NEWS and mailmap fixes
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap4
1 files changed, 4 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index c05b3b9540..d56fb67845 100644
--- a/.mailmap
+++ b/.mailmap
@@ -70,3 +70,7 @@ Otto Wallenius <otto_026@hotmail.com>
Tom Yan <tom.ty89@gmail.com>
Marty Plummer <ntzrmtthihu777@gmail.com>
Brian Boylston <brian.boylston@hpe.com>
+Thomas H. P. Andersen <phomes@gmail.com>
+Michael Olbrich <m.olbrich@pengutronix.de>
+Douglas Christman <DouglasChristman@gmail.com>
+Alexander Kuleshov <kuleshovmail@gmail.com> <0xAX@users.noreply.github.com>