From a228b4ccba88111fbf06c130623f3c8630eaa7b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 25 Feb 2015 13:50:46 +0100
Subject: Updating .mailmap

---
 .mailmap | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to '.mailmap')

diff --git a/.mailmap b/.mailmap
index 7cef9962f6a..b3119ff76d7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -32,10 +32,12 @@ Bernhard Posselt <dev@bernhard-posselt.com> Bernhard Posselt <nukeawhale@gmail.c
 Bernhard Posselt <dev@bernhard-posselt.com> Bernhard Posselt <Raydiation@users.noreply.github.com>
 Bernhard Reiter <ockham@raz.or.at>
 Birk Borkason <daniel.niccoli@gmail.com>
-Bjoern Schießle <schiessle@owncloud.com> Bjoern Schiessle <schiesbn@woody.(none)>
-Bjoern Schießle <schiessle@owncloud.com> Björn Schießle <bjoern@schiessle.org>
-Bjoern Schießle <schiessle@owncloud.com> Björn Schießle <schiesbn@potato.(none)>
-Bjoern Schießle <schiessle@owncloud.com> Björn Schiessle <schiessle@owncloud.com>
+Björn Schießle <schiessle@owncloud.com> Bjoern Schiessle <schiesbn@woody.(none)>
+Björn Schießle <schiessle@owncloud.com> Björn Schießle <bjoern@schiessle.org>
+Björn Schießle <schiessle@owncloud.com> Björn Schießle <schiesbn@potato.(none)>
+Björn Schießle <schiessle@owncloud.com> Björn Schiessle <schiessle@owncloud.com>
+Björn Schießle <schiessle@owncloud.com> Bjoern Schießle <schiessle@owncloud.com>
+Björn Schießle <schiessle@owncloud.com> Bjoern Schiessle <schiessle@owncloud.com>
 BlackEagle <ike.devolder@gmail.com>
 Boris Rybalkin <ribalkin@gmail.com>
 Borjan Tchakaloff <borjan@tchakaloff.fr>
-- 
cgit v1.2.3