diff options
| author | Dan McGee <dan@archlinux.org> | 2011-03-29 12:21:07 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-03-29 12:21:07 -0500 |
| commit | d3d18a42d2a12f65c51dec34608921cec7b42068 (patch) | |
| tree | c723c6a943e32fd5fabfddf9d671014f9e65b961 /.mailmap | |
| parent | 9477abc3591905a20acbfe7b8ce7832617d72701 (diff) | |
| parent | 287e8d356e8be8ae4af00e34e25d3f6727945952 (diff) | |
Merge branch 'maint'
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -6,10 +6,11 @@ Andres P <aepd87@gmail.com> <stderr@mail.com> Bryan Ischo <bryan@ischo.com> <bji-keyword-pacman.3644cb@www.ischo.com> Christos Nouskas <nous@archlinux.us> <nouskas@gmail.com> Daenyth Blank <daenyth+arch@gmail.com> <Daenyth+Arch@gmail.com> -Daenyth Blank <Daenyth+Arch@gmail.com> <Daenyth+git@gmail.com> +Daenyth Blank <Daenyth+arch@gmail.com> <Daenyth+git@gmail.com> 甘露(Gan Lu) <rhythm.gan@gmail.com> Giovanni Scafora <giovanni@archlinux.org> <linuxmania@gmail.com> Jaroslaw Swierczynski <swiergot@gmail.com> <swiergot@juvepoland.com> +Jonathan Conder <j@skurvy.no-ip.org> <jonno.conder@gmail.com> Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar> Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar> <jotapesan@gmail.com> Manuel Tortosa <manutortosa@chakra-project.org> <manutortosa@gmail.com> |