From e6739093dc7978d80b0578f03b2563faab87e011 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Fri, 15 Apr 2016 21:17:11 +0200
Subject: [PATCH] Update .mailmap for Marius Sturm

refs #9184
---
 .mailmap | 1 +
 AUTHORS  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 1fde5f02e..532cfbb46 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,3 +11,4 @@ Claudio Kuenzler <ck@claudiokuenzler.com>
 <lazyfrosch@icinga.org> <markus@lazyfrosch.de>
 <thomas.widhalm@netways.de> <widhalmt@widhalmt.or.at>
 <assaf@aikilinux.com> <assaf.flatto@livepopuli.com>
+<marius@graylog.com> <marius@torch.sh>
diff --git a/AUTHORS b/AUTHORS
index 13db26bdb..f09005fbf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -55,7 +55,7 @@ Louis Sautier <sautier.louis@gmail.com>
 Luca Lesinigo <luca@lm-net.it>
 Malte Rabenseifner <mail@malte-rabenseifner.de>
 Marcus van Dam <marcus@marcusvandam.nl>
-Marius Sturm <marius@torch.sh>
+Marius Sturm <marius@graylog.com>
 Markus Frosch <lazyfrosch@icinga.org>
 Markus Waldmüller <markus.waldmueller@netways.de>
 Martin Stiborsky <martin.stiborsky@gmail.com>