Merge branch 'sb/mailmap-merijn-brand'

gitster · gitster · commit 22930a0a8d21 · 2013-07-01T12:41:41.000-07:00
* sb/mailmap-merijn-brand:
  .mailmap: Map "H.Merijn Brand" to "H. Merijn Brand"
diff --git a/.mailmap b/.mailmap
@@ -24,6 +24,7 @@ Eric S. Raymond <esr@thyrsus.com>
 Erik Faye-Lund <kusmabite@gmail.com> <kusmabite@googlemail.com>
 Fredrik Kuivinen <freku045@student.liu.se>
 Frédéric Heitzmann <frederic.heitzmann@gmail.com>
+H. Merijn Brand <h.m.brand@xs4all.nl> H.Merijn Brand <h.m.brand@xs4all.nl>
 H. Peter Anvin <hpa@bonde.sc.orionmulti.com>
 H. Peter Anvin <hpa@tazenda.sc.orionmulti.com>
 H. Peter Anvin <hpa@trantor.hos.anvin.org>

-Original file line number
+Diff line change
 Erik Faye-Lund <[email protected]> <[email protected]>
 Fredrik Kuivinen <[email protected]>
 Frédéric Heitzmann <[email protected]>
 +H. Merijn Brand <[email protected]> H.Merijn Brand <[email protected]>
 H. Peter Anvin <[email protected]>
 H. Peter Anvin <[email protected]>
 H. Peter Anvin <[email protected]>