From c8cf31984d1d0acba05966fabda20b669e54ae41 Mon Sep 17 00:00:00 2001
From: Daniel Borkmann <dborkman@redhat.com>
Date: Wed, 23 Jan 2013 11:23:45 +0100
Subject: [PATCH] git: update mailmap

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
---
 .mailmap | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index e1b7d612..a19f41a9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,15 +5,20 @@
 # same person appearing not to be so.
 #
 
+Tobias Klauser <tklauser@distanz.ch>
+Emmanuel Roullit <emmanuel@netsniff-ng.org>
+Emmanuel Roullit <roullit@gnumaniacs.org>
+Jon Schipp <jonschipp@gmail.com>
+Christoph Jaeger <christoph@netsniff-ng.org>
+Christoph Jaeger <github@christophjaeger.fastmail.us>
 Daniel Borkmann <daniel@netsniff-ng.org>
 Daniel Borkmann <borkmann@gnumaniacs.org>
 Daniel Borkmann <dborkma@tik.ee.ethz.ch>
 Daniel Borkmann <borkmann@iogearbox.net>
 Daniel Borkmann <dborkman@redhat.com>
 Daniel Borkmann <borkmann@iogearbox.net>	root <root@nb-10309.(none)>
-Emmanuel Roullit <emmanuel@netsniff-ng.org>
-Emmanuel Roullit <roullit@gnumaniacs.org>
+Daniel Borkmann <borkmann@iogearbox.net>	darkstar <darkstar@thinkbox.(none)>
 Markus Amend <markus@netsniff-ng.org>
-Christoph Jaeger <christoph@netsniff-ng.org>
-Christoph Jaeger <github@christophjaeger.fastmail.us>
 Stefan Seering <sseeringgithub@gmx.de>
+Jesper Dangaard Brouer <brouer@redhat.com>
+Jim Binder <jbinder6342@gmail.com>
-- 
2.11.4.GIT