From a655c535783952f321b633af3577bc6d20c14aef Mon Sep 17 00:00:00 2001
From: Parnic <parnic@parnic.com>
Date: Thu, 26 May 2016 15:24:50 -0500
Subject: [PATCH] Added mailmap to merge authors

---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..2d0b522
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+cybeloras <cybeloras@wowace> Cybeloras <Cybeloras@wowace>