From e5f280f69832b4ee4156efe3e4ab320b7b9b7e89 Mon Sep 17 00:00:00 2001
From: Daniel Borkmann <dborkman@redhat.com>
Date: Tue, 4 Dec 2012 17:24:11 +0100
Subject: [PATCH] mailmap: update email aliases

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
---
 .mailmap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 251a5cde..e1b7d612 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,8 +9,8 @@ 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)>
-Daniel Borkmann <dxchgb@gmail.com>
 Emmanuel Roullit <emmanuel@netsniff-ng.org>
 Emmanuel Roullit <roullit@gnumaniacs.org>
 Markus Amend <markus@netsniff-ng.org>
-- 
2.11.4.GIT