From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu, 26 Mar 2015 16:17:18 +0000 (+0100)
Subject: Merge pull request #14495 from owncloud/update-mailmap-01
X-Git-Tag: v8.1.0alpha1~164
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a8b756154a533a2618f03c54aca56af957da12ae;p=nextcloud-server.git

Merge pull request #14495 from owncloud/update-mailmap-01

Updating .mailmap
---

a8b756154a533a2618f03c54aca56af957da12ae