From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Beller <stefanbeller@googlemail.com>
Subject: [PATCH 5/6] .mailmap: Multiple mail addresses of Johannes Schindelin
Date: Thu,  4 Jul 2013 16:04:18 +0200
Message-ID: <1372946659-10332-6-git-send-email-stefanbeller@googlemail.com>
References: <1372946659-10332-1-git-send-email-stefanbeller@googlemail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
Cc: Stefan Beller <stefanbeller@googlemail.com>
To: git@vger.kernel.org
X-From: git-owner@vger.kernel.org Thu Jul 04 16:04:53 2013
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@plane.gmane.org
Received: from vger.kernel.org ([209.132.180.67])
	by plane.gmane.org with esmtp (Exim 4.69)
	(envelope-from <git-owner@vger.kernel.org>)
	id 1Uuk9M-0002Dt-Mn
	for gcvg-git-2@plane.gmane.org; Thu, 04 Jul 2013 16:04:45 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932361Ab3GDOEl convert rfc822-to-quoted-printable (ORCPT
	<rfc822;gcvg-git-2@m.gmane.org>); Thu, 4 Jul 2013 10:04:41 -0400
Received: from mail-bk0-f54.google.com ([209.85.214.54]:60566 "EHLO
	mail-bk0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755247Ab3GDOEk (ORCPT <rfc822;git@vger.kernel.org>);
	Thu, 4 Jul 2013 10:04:40 -0400
Received: by mail-bk0-f54.google.com with SMTP id it16so673450bkc.13
        for <git@vger.kernel.org>; Thu, 04 Jul 2013 07:04:39 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=googlemail.com; s=20120113;
        h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references
         :mime-version:content-type:content-transfer-encoding;
        bh=oF6l+SoWZhgPSZzwA5suX4YM5WlyiisjFm7nJQhwK9o=;
        b=yqYXeWww49wqDsYFvgGMYk8lmkVthiHvxSba30hD1zNbYxTHaN3fqLpJDN5qu9Fp2L
         ed/OwAHJZb08P7gtjgL4BRJ22cqqyrx5kraDc3M+syQczojP0EVwhAhESBS5gDSgwd5i
         TqYIHnFaQhqloeMxz8XncMbWyhztIRf9/sQid9hoQxv4o2BOaX509E3d0bHlqTmKufFx
         8205267bHX2Ji/1QSC8sMhLSdw+DPVH6/jfHxtLBtO5WPkrcx23dvtpFXRTCz0BWhgTD
         fW/SEKDT18USt92tbiX3VH1F2UJqIYwpibuvJvs5aE0jA0E5Tng1AJ/BQBv/vCNmX1PO
         gdFQ==
X-Received: by 10.205.21.67 with SMTP id qr3mr1108801bkb.114.1372946679067;
        Thu, 04 Jul 2013 07:04:39 -0700 (PDT)
Received: from localhost (eduroam-74-151.uni-paderborn.de. [131.234.74.151])
        by mx.google.com with ESMTPSA id hn4sm1071161bkc.2.2013.07.04.07.04.37
        for <multiple recipients>
        (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
        Thu, 04 Jul 2013 07:04:38 -0700 (PDT)
X-Mailer: git-send-email 1.8.3.2.636.g7943f03
In-Reply-To: <1372946659-10332-1-git-send-email-stefanbeller@googlemail.com>
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/229588>

Different capitalization.

Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 1e94906..d7d7b89 100644
--- a/.mailmap
+++ b/.mailmap
@@ -38,6 +38,7 @@ Jakub Nar=C4=99bski <jnareb@gmail.com>
 Jay Soffian <jaysoffian+git@gmail.com>
 Jeff King <peff@peff.net> <peff@github.com>
 Joachim Berdal Haga <cjhaga@fys.uio.no>
+Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@=
gmx.de>
 Johannes Sixt <j6t@kdbg.org> <johannes.sixt@telecom.at>
 Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net>
 Johannes Sixt <j6t@kdbg.org> <J.Sixt@eudaptics.com>
--=20
1.8.3.2.636.g7943f03