From da6b44459287349e1949c601a12fa5ccda07572a Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Tue, 28 Jan 2014 13:46:18 -0800
Subject: update mailmap

---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.mailmap')

diff --git a/.mailmap b/.mailmap
index 810bda030c..7cab5ed019 100644
--- 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>
-- 
cgit v1.2.3