diff options
author | Mark H Weaver <mhw@netris.org> | 2016-10-12 09:28:14 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2016-10-12 09:28:14 -0400 |
commit | abcf4858cda9ded59671681ab9820b5358d8bb16 (patch) | |
tree | fd1b0a53affad3ad0eb9b3867a2c127228530973 /.mailmap | |
parent | 82adf4952ac1c03af3b41851ef4bbe1d2d6935a0 (diff) | |
parent | bfb48f4f33583f58392a05f1d6cbf559156293ed (diff) | |
download | guix-abcf4858cda9ded59671681ab9820b5358d8bb16.tar guix-abcf4858cda9ded59671681ab9820b5358d8bb16.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -30,10 +30,10 @@ 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> -ng0 <ngillmann@runbox.com> <ng0@we.make.ritual.n0.is> -ng0 <ngillmann@runbox.com> <niasterisk@grrlz.net> -ng0 <ngillmann@runbox.com> <ng@niasterisk.space> -ng0 <ngillmann@runbox.com> <ng0@libertad.pw> +ng0 <ng0@we.make.ritual.n0.is> <ngillmann@runbox.com> +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> |