From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates

---
 .mailmap |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..e47f177
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+James Moger <james.moger@gitblit.com>	James Moger <james.moger@gmail.com>
+James Moger <james.moger@gitblit.com>	James Moger <jmoger@vas.com>

--
Gitblit v1.9.1