summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJonathan Rudenberg <jonathan@titanous.com>2013-04-12 10:44:50 -0400
committerJonathan Rudenberg <jonathan@titanous.com>2013-04-12 10:44:50 -0400
commit343ed6b53f225e35bb5464efb556f555a31056a1 (patch)
tree566692c19e27de3cc2fa2d0507faef69fedf9578 /.mailmap
parent22893429ed29dbb7a01eed7a90a4d1fbecfd5d90 (diff)
downloaddocker-343ed6b53f225e35bb5464efb556f555a31056a1.tar.gz
Update AUTHORS
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 2570683f85..83c18fa29c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -14,3 +14,6 @@ Joffrey F <joffrey@dotcloud.com>
<joffrey@dotcloud.com> <f.joffrey@gmail.com>
Tim Terhorst <mynamewastaken+git@gmail.com>
Andy Smith <github@anarkystic.com>
+<kalessin@kalessin.fr> <louis@dotcloud.com>
+<victor.vieux@dotcloud.com> <victor@dotcloud.com>
+<dominik@honnef.co> <dominikh@fork-bomb.org>