Merge pull request scala#3422 from adriaanm/mailmap

adriaanm · adriaanm · commit dccf284867bc · 2014-02-01T09:17:42.000-08:00
update mailmap
diff --git a/.mailmap b/.mailmap
@@ -10,6 +10,7 @@ Aleksandar Prokopec <aleksandar.prokopec@epfl.ch> <aleksandar@lampmac14.epfl.ch>
 Aleksandar Prokopec <aleksandar.prokopec@epfl.ch> <axel22@gmail.com>
 Alex Cruise <alex@cluonflux.com>
 Alex Cruise <alex@cluonflux.com> <alex@metaforsoftware.com>
+A. P. Marki <som.snytt@gmail.com>
 Antonio Cunei <antonio.cunei@typesafe.com>
 Antonio Cunei <antonio.cunei@typesafe.com> <antonio.cunei@epfl.ch>
 Buraq Emir <buraq@epfl.ch>
@@ -71,5 +72,6 @@ Unknown Committer <lost.soul@typesafe.com> <USER@epfl.ch>
 Unknown Committer <lost.soul@typesafe.com> <noreply@epfl.ch>
 Viktor Klang <viktor.klang@gmail.com>
 Vincent Cremet <cremet@epfl.ch>
+Vladimir Nikolaev <vladimir.nikolaev9@gmail.com>
 Vojin Jovanovic <vojin.jovanovic@epfl.ch>
 Vojin Jovanovic <vojin.jovanovic@epfl.ch> <gvojin@gmail.com>

-Original file line number
+Diff line change
 Aleksandar Prokopec <[email protected]> <[email protected]>
 Alex Cruise <[email protected]>
 Alex Cruise <[email protected]> <[email protected]>
 +A. P. Marki <[email protected]>
 Antonio Cunei <[email protected]>
 Antonio Cunei <[email protected]> <[email protected]>
 Buraq Emir <[email protected]>
 Unknown Committer <[email protected]> <[email protected]>
 Viktor Klang <[email protected]>
 Vincent Cremet <[email protected]>
 +Vladimir Nikolaev <[email protected]>
 Vojin Jovanovic <[email protected]>
 Vojin Jovanovic <[email protected]> <[email protected]>