diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-06 14:00:28 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-06 14:00:28 -0400 |
| commit | 5ca2356bc754c952c8777722fb01ac8138b231fe (patch) | |
| tree | d6fe3d6562a747b021de71b8050a6a5c04d926ee | |
| parent | 27c55a1ba1243161cc990799f48e611200464fae (diff) | |
| parent | 870746d3c781f8cbd21a797bd0a791fc40407a0f (diff) | |
Merge remote-tracking branch 'sunny/edit-mailmap.wip'
| -rw-r--r-- | .mailmap | 25 |
1 files changed, 23 insertions, 2 deletions
@@ -1,7 +1,28 @@ +Antoine Beaupré <anarcat@koumbit.org> anarcat <anarcat@web> +Antoine Beaupré <anarcat@koumbit.org> https://id.koumbit.net/anarcat <https://id.koumbit.net/anarcat@web> +Greg Grossmeier <greg@grossmeier.net> http://grossmeier.net/ <greg@web> +Jimmy Tang <jtang@tchpc.tcd.ie> jtang <jtang@web> +Joachim Breitner <mail@joachim-breitner.de> http://www.joachim-breitner.de/ <nomeata@web> +Joey Hess <id@joeyh.name> Joey Hess <joey@gnu.kitenet.net> +Joey Hess <id@joeyh.name> Joey Hess <joey@kitenet.net> +Joey Hess <id@joeyh.name> Joey Hess <joeyh@debian.org> +Joey Hess <id@joeyh.name> Joey Hess <joeyh@fischer.debian.org> +Joey Hess <id@joeyh.name> Joey Hess <joeyh@joeyh.name> +Joey Hess <id@joeyh.name> Joey Hess <joeyh@oberon.tam-lin.net> +Joey Hess <id@joeyh.name> Joey Hess <joeyh@oberon.underhill.private> Joey Hess <id@joeyh.name> http://joey.kitenet.net/ <joey@web> -Joey Hess <id@joeyh.name> http://joeyh.name/ <joey@web> Joey Hess <id@joeyh.name> http://joeyh.name/ <http://joeyh.name/@web> +Joey Hess <id@joeyh.name> http://joeyh.name/ <joey@web> +Joey Hess <id@joeyh.name> https://www.google.com/accounts/o8/id?id=AItOawmJfIszzreLNvCqzqzvTayA9_9L6gb9RtY <Joey@web> +Johan Kiviniemi <devel@johan.kiviniemi.name> http://johan.kiviniemi.name/ <Johan@web> +Johan Kiviniemi <devel@johan.kiviniemi.name> http://johan.kiviniemi.name/ <http://johan.kiviniemi.name/@web> +Nicolas Pouillard <nicolas.pouillard@gmail.com> http://ertai.myopenid.com/ <npouillard@web> +Peter Simons <simons@cryp.to> Peter Simons <simons@ubuntu-12.04> +Peter Simons <simons@cryp.to> http://peter-simons.myopenid.com/ <http://peter-simons.myopenid.com/@web> +Philipp Kern <pkern@debian.org> http://phil.0x539.de/ <Philipp_Kern@web> +Richard Hartmann <richih@debian.org> https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U <Richard@web> Yaroslav Halchenko <debian@onerussian.com> Yaroslav Halchenko <debian@onerussian.com> http://yarikoptic.myopenid.com/ <site-myopenid@web> Yaroslav Halchenko <debian@onerussian.com> https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY <Yaroslav@web> -Richard Hartmann <richih@debian.org> https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U <Richard@web> +Øyvind A. Holm <sunny@sunbase.org> http://sunny256.sunbase.org/ <sunny256@web> +Øyvind A. Holm <sunny@sunbase.org> https://sunny256.wordpress.com/ <sunny256@web> |