diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-02-13 22:35:05 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-02-13 22:35:05 +0100 |
commit | 424b1ae76901c538457bd3c30d9d9cf67e79855f (patch) | |
tree | acc35c1160625618cd6083e728c6a4ff7e9cccc9 /.mailmap | |
parent | a50e03014177d2f00b5b85d3e1c295406f842016 (diff) | |
parent | eae2dbd47ac1f4a201b8584e2f88c30cd28e093a (diff) | |
download | patches-424b1ae76901c538457bd3c30d9d9cf67e79855f.tar patches-424b1ae76901c538457bd3c30d9d9cf67e79855f.tar.gz |
Merge branch 'master' into python-tests
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -40,11 +40,12 @@ Marius Bakke <mbakke@fastmail.com> <m.bakke@warwick.ac.uk> 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 <ng0@libertad.pw> <ng0@we.make.ritual.n0.is> -ng0 <ng0@libertad.pw> <ngillmann@runbox.com> -ng0 <ng0@libertad.pw> <niasterisk@grrlz.net> -ng0 <ng0@libertad.pw> <ng@niasterisk.space> -ng0 <ng0@libertad.pw> +ng0 <contact.ng0@cryptolab.net> +ng0 <contact.ng0@cryptolab.net> <ng0@we.make.ritual.n0.is> +ng0 <contact.ng0@cryptolab.net> <ngillmann@runbox.com> +ng0 <contact.ng0@cryptolab.net> <niasterisk@grrlz.net> +ng0 <contact.ng0@cryptolab.net> <ng@niasterisk.space> +ng0 <contact.ng0@cryptolab.net> <ng0@libertad.pw> Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public01@thebird.nl> Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public12@thebird.nl> Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public12@email> |