diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-07-20 11:42:02 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-07-20 11:42:17 +0200 |
| commit | 7575655212ecfbcd1f04e429c8a7a41f8720d027 (patch) | |
| tree | 558982d3cf50ef6b19ef293850de1f485fde66a6 /.mailmap | |
| parent | 5d4c90ae02f1e0b42d575bba2d828d63aaf79be5 (diff) | |
| parent | 5f01078129f4eaa4760a14f22761cf357afb6738 (diff) | |
| download | patches-7575655212ecfbcd1f04e429c8a7a41f8720d027.tar patches-7575655212ecfbcd1f04e429c8a7a41f8720d027.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -30,8 +30,9 @@ Ludovic Courtès <ludo@gnu.org> <ludovic.courtes@inria.fr> Mathieu Lirzin <mthl@gnu.org> <mthl@openmailbox.org> Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org> Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com> -Nils Gillmann <ng0@libertad.pw> <niasterisk@grrlz.net> -Nils Gillmann <ng0@libertad.pw> <ng@niasterisk.space> +ng0 <ng0@we.make.ritual.n0.is> <niasterisk@grrlz.net> +ng0 <ng0@we.make.ritual.n0.is> <ng@niasterisk.space> +ng0 <ng0@we.make.ritual.n0.is> <ng0@libertad.pw> Pjotr Prins <pjotr.public01@thebird.nl> Pjotr Prins <pjotr.public01@thebird.nl> <pjotr.public12@thebird.nl> Raimon Grau <raimonster@gmail.com> <raimon@3scale.net> @@ -41,3 +42,4 @@ Ricardo Wurmus <rekado@elephly.net> <ricardo.wurmus@mdc-berlin.de> Sou Bunnbu (宋文武) <iyzsong@gmail.com> Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> Tomáš Čech <sleep_walker@gnu.org> <sleep_walker@suse.cz> +Tobias Geerinckx-Rice <me@tobias.gr> <tobias.geerinckx.rice@gmail.com>
\ No newline at end of file |