diff options
| author | 宋文武 <iyzsong@gmail.com> | 2016-05-08 17:54:46 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@gmail.com> | 2016-05-08 17:54:46 +0800 |
| commit | 6655a74326beb18632b5c8277db39fd02a154007 (patch) | |
| tree | fed007de99235258098222f04fa1e4853c1d3d60 /.mailmap | |
| parent | 4e9d04a80b2d8b1e07f78708dae76b13f3d421f6 (diff) | |
| parent | 2d4422d5b53276661a68f65b91daa854de88c165 (diff) | |
| download | guix-6655a74326beb18632b5c8277db39fd02a154007.tar guix-6655a74326beb18632b5c8277db39fd02a154007.tar.gz | |
Merge branch 'master' into gnome-updates
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -12,6 +12,7 @@ Ben Woodcroft <donttrustben@gmail.com> <b.woodcroft@uq.edu.au> Ben Woodcroft <donttrustben@gmail.com> <donttrustben near gmail.com> Claes Wallin (韋嘉誠) <claes.wallin@greatsinodevelopment.com> Cyprien Nicolas <cyprien@nicolas.tf> <c.nicolas+gitorious@gmail.com> +Danny Milosavljevic <dannym@scratchpost.org> <dannym+a@scratchpost.org> David Thompson <davet@gnu.org> <dthompson2@worcester.edu> David Thompson <davet@gnu.org> <dthompson@member.fsf.org> David Thompson <davet@gnu.org> <dthompson@vistahigherlearning.com> @@ -28,10 +29,12 @@ 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 <niasterisk@grrlz.net> <ng@niasterisk.space> +Nils Gillmann <ng0@libertad.pw> <niasterisk@grrlz.net> +Nils Gillmann <ng0@libertad.pw> <ng@niasterisk.space> Pjotr Prins <pjotr.public01@thebird.nl> Pjotr Prins <pjotr.public01@thebird.nl> <pjotr.public12@thebird.nl> Raimon Grau <raimonster@gmail.com> <raimon@3scale.net> +Raymond Nicholson <rain1@openmailbox.org> Ricardo Wurmus <rekado@elephly.net> Ricardo Wurmus <rekado@elephly.net> <ricardo.wurmus@mdc-berlin.de> Sou Bunnbu (宋文武) <iyzsong@gmail.com> |