Merge branch 'fix_mix_str_and_non-str_arguments' of https://github.com/dzhuang/dulwich
[jelmer/dulwich.git] / .mailmap
1 Jelmer Vernooij <jelmer@jelmer.uk>      Jelmer Vernooij <jelmer@jelmer.uk>
2 Jelmer Vernooij <jelmer@jelmer.uk>      Jelmer Vernooij <jelmer@samba.org>
3 Benoit HERVIER <khertan@khertan.net>    Benoît HERVIER <khertan@khertan.net>
4 John Carr <john.carr@unrouted.co.uk>    Jc2k <john.carr@unrouted.co.uk>
5 Dave Borowitz <dborowitz@google.com>    David Borowitz <dborowitz@google.com>
6 Dave Borowitz <dborowitz@google.com>    Dave Borowitz <ddborowitz@gmail.com>
7 Marcin Kuzminski <marcin@python-works.com>      Marcin Kuźmiński <marcin@python-blog.com>
8 Ryan Faulkner <rfaulk@yahoo-inc.com>    rfaulk <rfaulkner@wikimedia.org>
9 Martin Packman <gzlist@googlemail.com>  Martin Packman <martin.packman@canonical.com>
10 Martin Packman <gzlist@googlemail.com>  Martin <gzlist@googlemail.com>