Merge aea16ec into 877aafd

plu · Feb 17, 2018 · 00b47d7 · 00b47d7
2 parents 877aafd + aea16ec
commit 00b47d7
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,9 @@
+Andreas Marienborg <andreas.marienborg@gmail.com>
+Andreas Marienborg <andreas.marienborg@gmail.com> <omega@palle.net>
+Johannes Plunien <plu@pqpq.de>
+Johannes Plunien <plu@pqpq.de> <johannes.plunien@metaquark.de>
+Johannes Plunien <plu@pqpq.de> <johannes.plunien@xing.com>
+José Joaquín Atria <jjatria@cpan.org> <jjatria@gmail.com>
+SUZUKI Masashi <m15.suzuki.masashi@gmail.com>
+Zoffix Znet <cpan@zoffix.com>
+Zoffix Znet <cpan@zoffix.com> <zoffixznet@users.noreply.github.com>