From 52ba14ed055ef2a89d3babb1c5543327d05acfe0 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 26 Oct 2015 13:56:50 +0100
Subject: [PATCH] Update .mailmap

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

diff --git a/.mailmap b/.mailmap
index 95841a3635..ec69fc5318 100644
--- a/.mailmap
+++ b/.mailmap
@@ -129,6 +129,7 @@ Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <frank@oc.(none)>
 Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <karlitschek@gmx.de>
 Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <karlitschek@kde.org>
 François Kubler <francois@kubler.org>
+Frédéric Fortier <frederic.fortier@oronospolytechnique.com> Frédéric Fortier <frederic.fortier@polymtl.ca>
 Frederik Gladhorn <gladhorn@kde.org>
 Gadzy <dev@gadzy.fr>
 ganomi <ganomi@gmail.com>
@@ -306,7 +307,7 @@ Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail>
 Robin Appelman <icewind@owncloud.com> Robin Appelman <robin@icewind.nl>
 Robin McCorkell <rmccorkell@karoshi.org.uk> Robin McCorkell <rmccorkell@owncloud.com>
 Rodrigo Hjort <rodrigo.hjort@gmail.com>
-Roeland Jago Douma <roeland@famdouma.nl>
+Roeland Jago Douma <rullzer@owncloud.com> Roeland Jago Douma <roeland@famdouma.nl>
 rok <brejktru@gmail.com>
 Roland Hager <roland.hager@tu-berlin.de>
 Roland van Laar <roland@micite.net>