firewall-lib.pl: Use get_geoip_locations from geoip-functions.pl

[ipfire-2.x.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 5a9212aeaae36b6753927b0790127dc230a10a07..ec5ad1987878b7345d819d1f0c991a91957630cf 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -13,8 +13,11 @@ Christian Schmidt    <maniacikarus.ipfire.org>
 Christian Schmidt      <maniacikarus@ipfire.org>
 Christian Schmidt      <root@daedalus.homeip.net>
 Christian Schmidt      <root@ikarus.homeip.net>
+Daniel Weismüller     <whytea@ipfire.org>
 Dirk Wagner            <root@etch-server.wagner-budenheim.de>
 Heiner Schmeling       <casemaster@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
+Jan Paul Tücking      <earl@ipfire.org>
+Jörn-Ingo Weigert     <jiweigert@ipfire.org>
 Michael Tremer <delaco@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
 Michael Tremer <ipfire@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
 Michael Tremer <michael.tremer.info>
@@ -28,3 +31,4 @@ Michael Tremer        <root@rowena.ipfire.org>
 Peter Pfeiffer <root@VMipfire.pfeiffer-privat.de>
 Rene Zingel    <linuxadmin@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
 Ronald Wiesinger       <rowie@ipfire.org>
+Stéphane Pautrel      <steph78630@gmail.com>